diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2024-02-20 17:07:48 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-03-01 00:30:06 +0300 |
| commit | 73bd93f1d0a338767f36fd1acb54c52ad057db39 (patch) | |
| tree | f5c80db4a466b90aacce702b852945785bdd51a3 /meta-openembedded | |
| parent | f5510eca70b356348a25198e2d9c38039f68365b (diff) | |
| download | openbmc-73bd93f1d0a338767f36fd1acb54c52ad057db39.tar.xz | |
subtree updates
poky: 348d9aba33..fc8e5d7c13:
Adithya Balakumar (1):
wic: implement reproducible Disk GUID
Adrian Freihofer (20):
cmake.bbclass: use --install
devtool: support plugins with plugins
devtool: refactor exec_fakeroot
devtool: refactor deploy to use exec_fakeroot_no_d
devtool: refactor deploy-target
recipetool: cleanup imports
oeqa: replace deprecated assertEquals
oeqa/selftest/recipetool: fix for python 3.12
oeqa/selftest/oelib/buildhistory: git default branch
scripts: python 3.12 regex
feature-microblaze-versions.inc: python 3.12 regex
meta/lib/oeqa: python 3.12 regex
meta/lib/patchtest: python 3.12 regex
meta/recipes: python 3.12 regex
bitbake: bitbake/lib/bs4/tests/test_tree.py: python 3.12 regex
devtool: new ide-sdk plugin
oe-selftest devtool: ide-sdk tests
devtool: ide-sdk make deploy-target quicker
vscode: drop .vscode folder
oe-init-build-env: generate .vscode from template
Aleksey Smirnov (2):
conf/machine: Add Power8 tune to PowerPC architecture
busybox: Explicitly specify tty device for serial consoles
Alex Kiernan (1):
wireless-regdb: Upgrade 2023.09.01 -> 2024.01.23
Alex Stewart (3):
opkg: upgrade to 0.6.3
opkg: add deprecation warning for internal solver
opkg-arch-config: update recipe HOMEPAGE
Alexander Kanavin (26):
sysroot user management postinsts: run with /bin/sh -e to report errors when they happen
classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS
classes/staging: capture output of sysroot postinsts into logs
classes/package_rpm: write file permissions and ownership explicitly into .spec
classes/package_rpm: use weak user/group dependencies
classes/package_rpm: set bogus locations for passwd/group files
oeqa/runtime/rpm: fail tests if test rpm file cannot be found
rpm: update 4.18.1 -> 4.19.1
classes/package_rpm: correctly escape percent characters
setftest/cdn tests: check for exceptions also in fetcher diagnostics
rpm: override curl executable search with just 'curl'
classes/package_rpm: additionally escape \ and " in filenames
classes/package_rpm: streamline the logic in one of the condition blocks
lzlib: add a recipe
file: enable additional internal compressor support
selftest/SStateCacheManagement: do not manipulate ERROR_QA
selftest/SStateCacheManagement: pre-populate the cache
shadow: add a packageconfig for logind support
meta/conf/templates/default/conf-notes.txt: remove
scripts/oe-setup-layers: write a list of layer paths into the checkout's top dir
meta/conf/templates/default/conf-summary.txt: add a template summary
meta/lib/bblayers/buildconf.py: add support for configuration summaries
scripts/oe-setup-builddir: add support for configuration summaries
oe-setup-build: add a tool for discovering config templates and setting up builds
meta-poky/conf/templates/default/conf-summary.txt: add a template summary
bitbake: Revert "bitbake: wget.py: always use the custom user agent"
Alexis Lothoré (3):
patchtest-send-results: remove unused variable
patchtest-send-results: properly parse test status
testimage: retrieve ptests directory when ptests fail
André Draszik (4):
sstate-cache-management: fix regex for 'sigdata' stamp files
bitbake: fetch/git2: support git's safe.bareRepository
bitbake: tests/fetch: support git's safe.bareRepository
bitbake: git-make-shallow: support git's safe.bareRepository
Anibal Limon (1):
ptest-runner: Bump to 2.4.3 (92c1b97)
Anuj Mittal (8):
enchant2: upgrade 2.6.5 -> 2.6.7
libproxy: upgrade 0.5.3 -> 0.5.4
sqlite3: upgrade 3.44.2 -> 3.45.1
orc: upgrade 0.4.36 -> 0.4.37
stress-ng: upgrade 0.17.04 -> 0.17.05
libcap-ng: fix build with swig 4.2.0
gstreamer1.0: upgrade 1.22.9 -> 1.22.10
swig: upgrade 4.1.1 -> 4.2.0
Bruce Ashfield (13):
lttng-modules: fix v6.8+ build
linux-yocto-dev: update to v6.8
linux-yocto/6.6: features/qat/qat.cfg: enable CONFIG_PCIEAER
linux-yocto/6.6: beaglebone: drop nonassignable kernel options
linux-yocto/6.6: update to v6.6.13
linux-yocto/6.6: update CVE exclusions
linux-yocto/6.6: can: drop obsolete CONFIG_PCH_CAN
linux-yocto/6.6: update to v6.6.15
linux-yocto/6.6: update CVE exclusions
yocto-bsp: update reference boards to v6.6.15
linux-yocto/6.6: update to v6.6.16
linux-yocto/6.6: update CVE exclusions
linux-yocto/6.6: qemuriscv: enable goldfish RTC
Chen Qi (5):
multilib_global.bbclass: fix parsing error with no kernel module split
gnupg: disable tests to avoid running target binaries at build time
bitbake: fetch2/git.py: fix a corner case in try_premirror
bitbake: tests/fetch.py: add test case for using premirror in restricted network
bitbake: fetch2/git.py: add comment in try_premirrors
Chi Xu (1):
xz: Add ptest support
Claus Stovgaard (2):
kernel-devsrc: fix RDEPENDS for make
kernel-devsrc: RDEPENDS on gawk
Clément Péron (1):
libpcap: extend with nativesdk
Colin McAllister (1):
initscripts: Add custom mount args for /var/lib
David Reyna (1):
bitbake: taskexp_ncurses: ncurses version of taskexp.py
Denys Dmytriyenko (3):
lttng-modules: upgrade 2.13.10 -> 2.13.11
zlib: upgrade 1.3 -> 1.3.1
xz: upgrade 5.4.5 -> 5.4.6
Enguerrand de Ribaucourt (3):
devtool: ide_sdk: Use bitbake's python3 for generated scripts
devtool: ide: vscode: Configure read-only files
meson: use absolute cross-compiler paths
Enrico Jörns (1):
rootfs-postcommands: remove make_zimage_symlink_relative()
Etienne Cordonnier (1):
dropbear: remove unnecessary line
Fabien Mahot (1):
ldconfig-native: Fix to point correctly on the DT_NEEDED entries in an ELF file
Fabio Estevam (3):
piglit: Update to latest revision
mesa: Upgrade 23.3.3 -> 23.3.4
mesa: Upgrade 23.3.4 -> 23.3.5
Jamin Lin (3):
uboot-sign: set load address and entrypoint
uboot-sign: Fix to install nonexistent dtb file
u-boot-sign:uboot-config: support to verify signed FIT image
Jermain Horsman (2):
bitbake-layers: Add ability to update the reference of repositories
bitbake-layers: Add test case layers setup for custom references
Joe Slater (1):
eudev: allow for predictable network interface names
Johannes Schneider (2):
initramfs-framework: overlayroot: fix kernel commandline clash
initramfs-framework: overlayroot: align bootparams with module name
Jon Mason (2):
tunes/sve: Add support for sve2 instructions
arm/armv*: add all the Arm tunes in GCC 13.2.0
Jonathan GUILLOT (3):
lib/oe/package: replace in place PN-locale-* packages in PACKAGES
lib/oe/package: add LOCALE_PATHS to add define all locations for locales
cups: use LOCALE_PATHS to split localized HTML templates
Jose Quaresma (3):
go: update 1.20.12 -> 1.20.13
systemd: pack pre-defined pcrlock files installed with tpm2
qemu: disbale AF_XDP network backend support
Joshua Watt (8):
bitbake: hashserv: Add Unihash Garbage Collection
bitbake: hashserv: sqlalchemy: Use _execute() helper
bitbake: hashserv: Add unihash-exists API
bitbake: asyncrpc: Add Client Pool object
bitbake: hashserv: Add Client Pool
bitbake: siggen: Add parallel query API
bitbake: siggen: Add parallel unihash exist API
sstatesig: Implement new siggen API
Kai Kang (2):
rpm: fix dependency for package config imaevm
ghostscript: correct LICENSE with AGPLv3
Khem Raj (27):
elfutils: Fix build with gcc trunk
python3: Initialize struct termios before calling tcgetattr()
qemu: Replace the basename patch with backport
xwayland: Upgrade 23.2.3 -> 23.2.4
armv8/armv9: Avoid using -march when -mcpu is chosen
kexec-tools: Fix build with gas 2.42
systemtap: Backport GCC-14 related calloc fixes
sdk/assimp.py: Fix build on 32bit arches with 64bit time_t
binutils: Upgrade to binutils 2.42
qemu-native: Use inherit_defer for including native class
syslinux: Disable error on implicit-function-declaration
glibc: Upgrade to 2.39
strace: Upgrade to 6.7
rust/cargo: Build fixes to rust for rv32 target
buildcpio.py: Switch to using cpio-2.15
ptest.bbclass: Handle the case when Makefile does not exist in do_install_ptest_base
kernel-devsrc: Add needed fixes for 6.1+ kernel build on target on RISCV
python3: Fix ptests with expat 2.6+
expat: Upgrade to 2.6.0
gcc-runtime: Move gdb pretty printer file to auto-load location
core-image-ptest: Increase disk size to 1.5G for strace ptest image
tcmode-default: Do not define LLVMVERSION
glibc: Update to latest on 2.39
glibc: Update to bring mips32/clone3 fix
piglit: Fix build with musl
llvm: Upgrade to LLVM-18 RC2
binutils: Update to tip of 2.42 release branch
Konrad Weihmann (1):
python3-yamllint: add missing dependency
Lee Chee Yang (1):
migration-guide: add release notes for 4.0.16
Maanya Goenka (2):
toolchain-shar-relocate: allow 'find' access to libraries in symlinked directories
bash: nativesdk-bash does not provide /bin/bash so don't claim to
Marek Vasut (1):
Revert "lzop: remove recipe from oe-core"
Mark Hatle (5):
qemu: Allow native and nativesdk versions on Linux older then 4.17
tune-cortexa78.inc: Add cortexa78 tune, based on cortexa77
feature-arm-vfp.inc: Allow hard-float on newer simd targets
tune-cortexr5: Add hard-float variant
tune-cortexr52: Add hard-float variant
Markus Volk (6):
gtk4: update 4.12.4 -> 4.12.5
mesa: update 23.3.5 -> 24.0.0
mesa: update 24.0.0 -> 24.0.1
libadwaita: update 1.4.2 -> 1.4.3
wayland-protocols: update 1.32 -> 1.33
ell: update 0.61 -> 0.62
Martin Jansa (5):
qemu: fix target build with ccache enabled
package_manager: ipk: add OPKG_MAKE_INDEX_EXTRA_PARAMS variable
package_rpm: add RPMBUILD_EXTRA_PARAMS variable
bitbake: bitbake-diffsigs: fix walking the task dependencies and show better error
bitbake: tests: fetch.py: use real subversion repository
Michael Opdenacker (9):
dev-manual: start: remove idle line
docs: remove support for mickledore (4.2) release
release-notes-4.3: fix spacing
alsa-lib: upgrade 1.2.10 -> 1.2.11
alsa-tools: upgrade 1.2.5 -> 1.2.11
alsa-ucm-conf: upgrade 1.2.10 -> 1.2.11
alsa-utils: upgrade 1.2.10 -> 1.2.11
oeqa/runtime/cases: fix typo in information message
bitbake: doc: README: simpler link to contributor guide
Michal Sieron (1):
sanity.bbclass: raise_sanity_error if /tmp is noexec
Nick Owens (1):
systemd: recommend libelf, libdw for elfutils flag
Ola x Nilsson (1):
python3-numpy: Use Large File Support version of fallocate
Paul Gortmaker (1):
bitbake: hashserv: improve the loglevel error message to be more helpful
Pavel Zhukov (3):
systemd.bbclass: Check for existence of the symlink too
bitbake: fetch2/git.py: Fetch mirror into HEAD
bitbake: tests/fetch.py: add multiple fetches test
Peter Kjellerstedt (12):
devtool: modify: Correct appending of type=git-dependency to URIs
devtool: standard: Add some missing whitespace
devtool: _extract_source: Correct the removal of an old backup directory
bitbake: tests/fetch: Make test_git_latest_versionstring support a max version
bitbake: fetch2/git: A bit of clean-up of latest_versionstring()
bitbake: fetch2/git: Make latest_versionstring extract tags with slashes correctly
lib/oe/patch: Make extractPatches() not extract ignored commits
lib/oe/patch: Add GitApplyTree.commitIgnored()
devtool: Make use of oe.patch.GitApplyTree.commitIgnored()
patch.bbclass: Make use of oe.patch.GitApplyTree.commitIgnored()
lib/oe/patch: Use git notes to store the filenames for the patches
insane.bbclass: Allow the warning about virtual/ to be disabled
Peter Marko (2):
openssl: Upgrade 3.2.0 -> 3.2.1
util-linux: add alternative link for scriptreplay
Petr Vorel (1):
ltp: Update to 20240129
Philip Lorenz (1):
ipk: Remove temporary package lists during SDK creation
Priyal Doshi (1):
tzdata : Upgrade to 2024a
Quentin Schulz (1):
u-boot: add missing dependency on pyelftools-native
Randolph Sapp (1):
mirrors.bbclass: add infraroot as an https mirror
Randy MacLeod (4):
valgrind: make ptest depend on all components
valgrind: update from 3.21.0 to 3.22.0
valgrind: skip 14 ptests in 3.22
valgrind: Skip 22 arm64 ptests
Richard Purdie (34):
oeqa/qemurunner: Handle rare shutdown race
pseudo: Update to pull in gcc14 fix and missing statvfs64 intercept
numactl: upgrade 2.0.16 -> 2.0.17
conf: Move selftest config to dedicated inc file
oeqa/selftest/bbtests: Tweak to use no-gplv3 inc file
python3-markupsafe: upgrade 2.1.3 -> 2.1.5
python3-markupsafe: Switch to python_setuptools_build_meta
qemu: Upgrade 8.2.0 -> 8.2.1
ltp: Enable extra test groups
ltp: Try re-enabling problematic test
meta-yocto-bsp: Remove accidentally added files
oeqa/runtime: Move files from oe-core to bsp layer
mirrors: Allow shallow glibc to work correctly
ptest-packagelists: Mark python3 as problematic on riscv64
kernel-devsrc: Clean up whitespace
selftest/recipetool: Factor tomllib test to a function
selftest/recipetool: Improve test failure output
layer.conf: Update for the scarthgap release series
layer.conf: Update for the scarthgap release series
bitbake: process: Add profile logging for main loop
bitbake: process/server: Fix typo
kernel-arch: Simplify strip support
insane: Clarify runtime/ warning
bitbake: runqueue: Improve performance for executing tasks
bitbake: runqueue: Optimise taskname lookups in next_buildable_task
bitbake: runqueue: Improve setcene performance when encoutering many 'hard' dependencies
openssh: Add a work around for ICE on mips/mips64
kernel-devsrc: Improve vdso-offsets handling for qemuriscv64
u-boot: Pass in prefix mapping variables to the compiler
testsdk: Avoid PATH contamination
oeqa/selftest/rust: Exclude failing riscv tests
bitbake: bitbake: Bump version to 2.7.3 for hashserv changes
sanity.conf: Require bitbake 2.7.3
python: Drop ${PYTHON_PN}
Robert Joslyn (2):
curl: Update to 8.6.0
gtk: Set CVE_PRODUCT
Robert Yang (1):
gnu-config: Update to latest version
Ross Burton (13):
grub2: ignore CVE-2023-4001, this is Red Hat-specific
openssl: backport fix for CVE-2023-6129
lib/oeqa: rename assertRaisesRegexp to assertRaisesRegex
oeqa/selftest/recipetool: downgrade meson version to not use pyproject.toml
recipetool: don't dump stack traces if a toml parser can't be found
xz: remove redundant PTEST_ENABLED conditional
libpam: remove redundant PTEST_ENABLED conditional
glib-2.0: backport memory monitor test fixes
python3: move dataclasses to python3-core
python3-unittest-automake-output: upgrade to 0.2
meson: remove TMPDIR workaround
meson: set the sysroot in the cross files
libffi: upgrade to 3.4.5
Simone Weiß (12):
gnutls: Upgrade 3.8.2 -> 3.8.3
maintainers.inc: Add self for libseccomp and gnutls
bsp-guide: correct formfactor recipe name
dev-manual: gen-tapdevs need iptables installed
gnutls: print log if ptest fails
patchtest: log errors and failures at end
grub2: ignore CVE-2024-1048, Redhat only issue
libgit2: update 1.7.1 -> 1.7.2
libuv: Upgrade 1.47.0 -> 1.48.0
qemu: Set CVE_STATUS for wrong CVEs
patchtest: Add selftest for test cve_check_ignore
patchtest: add stronger indication for failed tests
Siong W.LIM (1):
useradd.bbclass: Fix missing space when appending vardeps.
Thomas Perrot (2):
opensbi: append LDFLAGS to TARGET_CC_ARCH
bitbake: wget.py: always use the custom user agent
Tim Orling (13):
libxml-parser-perl: upgrade 2.46 -> 2.47
python3-pyyaml: add PACKAGECONFIG for libyaml
python3-pyyaml: enable ptest
python3-cryptography: upgrade 41.0.7 to 42.0.2
openssh: upgrade 9.5p1 -> 9.6p1
python3-poetry-core: upgrade 1.8.1 -> 1.9.0
python3-attrs: skip test failing with pytest-8
vim: upgrade from 9.0.2130 -> 9.1.0114
python3-pyproject-metadata: move from meta-python
python3-pyproject-metadata: HOMEPAGE; DESCRIPTION
python3-meson-python: move from meta-python
python_mesonpy.bbclass: move from meta-python
recipetool; add support for python_mesonpy class
Tobias Hagelborn (2):
sstate.bbclass: Only sign packages at the time of their creation
bitbake: bitbake: hashserv: Postgres adaptations for ignoring duplicate inserts
Toni Lammi (1):
bitbake: support temporary AWS credentials
Trevor Gamblin (7):
patchtest.README: update mailing list
cmake: upgrade 3.27.7 -> 3.28.3
python3-numpy: upgrade 1.26.3 -> 1.26.4
patchtest-send-results: Add 'References' header
patchtest-send-results: use Message-ID directly
patchtest: Fix grammar in log output
patchtest-send-results: add --debug option
Valek Andrej (1):
glibc: Refresh CVE status w.r.t 2.39 release
Vikas Katariya (1):
bmap-tools: Add missing runtime dependency
Wang Mingyu (36):
at-spi2-core: upgrade 2.50.0 -> 2.50.1
cpio: upgrade 2.14 -> 2.15
ethtool: upgrade 6.6 -> 6.7
iso-codes: upgrade 4.15.0 -> 4.16.0
libinput: upgrade 1.24.0 -> 1.25.0
libtest-warnings-perl: upgrade 0.032 -> 0.033
libwpe: upgrade 1.14.1 -> 1.14.2
lzip: upgrade 1.23 -> 1.24
createrepo-c: upgrade 1.0.2 -> 1.0.3
diffstat: upgrade 1.65 -> 1.66
dos2unix: upgrade 7.5.1 -> 7.5.2
ed: upgrade 1.19 -> 1.20
gnupg: upgrade 2.4.3 -> 2.4.4
gstreamer: upgrade 1.22.8 -> 1.22.9
libidn2: upgrade 2.3.4 -> 2.3.7
libpng: upgrade 1.6.40 -> 1.6.41
libsolv: upgrade 0.7.27 -> 0.7.28
liburi-perl: upgrade 5.21 -> 5.25
nghttp2: upgrade 1.58.0 -> 1.59.0
repo: upgrade 2.40 -> 2.41
orc: upgrade 0.4.34 -> 0.4.36
pkgconf: upgrade 2.0.3 -> 2.1.0
python3-sphinxcontrib-applehelp: upgrade 1.0.7 -> 1.0.8
python3-sphinxcontrib-devhelp: upgrade 1.0.5 -> 1.0.6
python3-sphinxcontrib-htmlhelp: upgrade 2.0.4 -> 2.0.5
python3-sphinxcontrib-qthelp: upgrade 1.0.6 -> 1.0.7
python3-sphinxcontrib-serializinghtml: upgrade 1.1.9 -> 1.1.10
python3-beartype: upgrade 0.16.4 -> 0.17.0
python3-mako: upgrade 1.3.0 -> 1.3.2
python3-hatchling: upgrade 1.21.0 -> 1.21.1
python3-hypothesis: upgrade 6.92.9 -> 6.97.3
python3-pluggy: upgrade 1.3.0 -> 1.4.0
python3-psutil: upgrade 5.9.7 -> 5.9.8
python3-pyopenssl: upgrade 23.3.0 -> 24.0.0
python3-pytz: upgrade 2023.3 -> 2023.4
python3-pytest: upgrade 7.4.4 -> 8.0.0
Xiangyu Chen (1):
bash: rebase the patch to fix ptest failure
Yi Zhao (2):
rpm: add missing dependencies for packageconfig
libsdl2: upgrade 2.28.5 -> 2.30.0
Yoann Congal (2):
kexec-tools: Replace a submitted patch by the backported one
waf.bbclass: Print waf output on unparsable version
Yogita Urade (1):
tiff: fix CVE-2023-52355 and CVE-2023-52356
baruch@tkos.co.il (3):
contributor-guide: fix lore URL
overlayfs: add missing closing parenthesis in selftest
overlayfs-etc: add option to skip creation of mount dirs
meta-arm: 6bb1fc8d8c..025f76a14f:
Ali Can Ozaslan (1):
arm-bsp/u-boot:corstone1000: Fix deployment of capsule files
Drew Reed (4):
bsp: Move Corstone-1000 U-Boot configuration entries
bsp: Move machine settings
bsp,ci: Switch to poky distro
bsp: Rename corstone1000-image
Harsimran Singh Tungal (2):
n1sdp:arm arm-bsp: fix tftf tests for n1sdp
arm-bsp/optee: upgrade optee to 4.1.0 for N1SDP
Jon Mason (3):
arm/opencsd: update to v1.5.1
arm/optee: update to 4.1
arm-bsp/optee: remove unused v3.22.0 recipes
Khem Raj (1):
layer.conf: Update for the scarthgap release series
Ross Burton (5):
CI: support extra kas files from environment
CI/cve.yml: add a CVE-checking Kas fragment
CI: add explanatory comments to variables
CI: allow the runner to set a NVD API key
CI: use https: to fetch meta-virtualization
Vincent Stehlé (1):
arm-bsp/documentation: corstone1000: fix typo
meta-security: b2e1511338..30e755c592:
Armin Kuster (3):
python3-pyinotify: do not rely on smtpd module
python3-fail2ban: remove unused distutils dependency
scap-security-guide: update to 0.1.71
BELOUARGA Mohamed (2):
checksec: Add more runtime dependencies to checksec tool
lynis: Add missing runtime dependencies
Leon Anavi (2):
linux-yocto%.bbappend: Add audit.cfg
integrity-image-minimal: Fix IMAGE_INSTALL
Mikko Rapeli (1):
parsec-tool: fix serialNumber check
Yi Zhao (1):
openscap: fix build with python 3.12
Yushi Sun (1):
meta-security: libhoth: SRCREV bump e520f8f...e482716
meta-raspberrypi: 9c901bf170..dbf1113a82:
Kevin Hao (1):
rpidistro-ffmpeg: Fix old override syntax
Khem Raj (3):
linux-raspberrypi_6.1.bb: Upgrade to 6.1.74
linux-raspberrypi: Upgrade to 6.1.77
layer.conf: Update for the scarthgap release series
Martin Jansa (1):
libcamera-apps: fix build with libcamera-0.2.0
Matthew Draws (1):
rpi-eeprom_git: v.2024.01.05-2712 Update recipe to latest rpi-eeprom repo This follows the current latest release of rpi-eeprom: https://github.com/raspberrypi/rpi-eeprom
Pascal Huerst (1):
rpi-base: Add missing hifiberry overlay
meta-openembedded: 9953ca1ac0..528f273006:
Alex Kiernan (3):
mdns: Fix SIGSEGV during DumpStateLog()
mdns: Upgrade 2200.60.25.0.4 -> 2200.80.16
c-ares: Upgrade 1.24.0 -> 1.26.0
Angelo Ribeiro (1):
flatcc: Add tool recipe
Angelo.Ribeiro (1):
e2tools: Add tool recipe
Archana Polampalli (1):
nodejs: update to latest v20 version 20.11.0
Beniamin Sandu (3):
mbedtls: upgrade 3.5.1 -> 3.5.2
mbedtls: upgrade 2.28.4 -> 2.28.7
opencv: upgrade 4.8.0 -> 4.9.0
Changqing Li (1):
cpuid: fix do_install
Chirag Shilwant (1):
kernel-selftest: Add few more testcases
Christophe Vu-Brugier (4):
dropwatch: add new recipe
switchtec-user: upgrade 4.1 -> 4.2
libnvme: upgrade 1.7.1 -> 1.8
nvme-cli: upgrade 2.7.1 -> 2.8
Clément Péron (2):
proj: extend class to native and nativesdk
proj: upgrade 9.3.0 -> 9.3.1
Denys Dmytriyenko (1):
libcamera: update 0.1.0 -> 0.2.0
Derek Straka (36):
python3-bandit: update to version 1.7.7
python3-web3: update to version 6.15.0
python3-argcomplete: update to version 3.2.2
python3-cytoolz: update to version 0.12.3
python3-pdm: update to version 2.12.2
python3-google-api-python-client: update to version 2.115.0
python3-coverage: update to version 7.4.1
python3-gmqtt: update to version 0.6.14
python3-colorlog: update to version 6.8.2
python3-argh: update to version 0.31.2
python3-luma-core: update to version 2.4.2
python-pdm: update to version 2.12.3
python3-parse: update to version 1.20.1
python3-grpcio: update to version 1.60.1
python3-dill: update to version 0.3.8
python3-types-setuptools: update to version 69.0.0.20240125
python3-pymisp: update to version 2.4.184
python3-cbor2: update to version 5.6.1
python3-sentry-sdk: update to version 1.40.0
python3-pytest-asyncio: update to version 0.23.4
python3-google-api-core: update to version 2.16.1
python3-google-api-python-client: update to version 2.116.0
python3-google-auth: update to version 2.27.0
python3-jsonrpcclient: update to version 4.0.3
python3-dnspython: update to version 2.5.0
python3-eventlet: update to version 0.35.1
python3-platformdirs: update to version 4.2.0
python3-ipython: update to version 8.21.0
python3-grpcio-tools: update to version 1.60.1
python3-cachecontrol: update to version 0.14.0
python3-binwalk: update the regex version for upstream checks
python3-pymodbus: update to version 3.6.3
python3-pyyaml-include: add initial recipe for version 1.3.2
python3-appdirs: add ptest into PTESTS_FAST_META_PYTHON items
python3-yarl: add ptest into PTESTS_FAST_META_PYTHON items
python3-ujson: add ptest into PTESTS_FAST_META_PYTHON items
Emil Kronborg (1):
php-fpm: fix systemd
Etienne Cordonnier (2):
uutils-coreutils: upgrade 0.0.23 -> 0.0.24
uutils_coreutils: merge .inc and .bb
Fathi Boudra (4):
whitenoise: add a new recipe
python3-django: upgrade to Django 4.2.10 LTS release
libtinyxml2: fix the homepage URL
libtinyxml2: allow to build both shared and static libraries
Geoff Parker (2):
python3-aiodns python3-pycares: Add native & nativesdk support
python3-aiohappyeyeballs: Add native & nativesdk support
Jean-Marc BOUCHE (1):
rtkit: missing files/directories in package
Jose Quaresma (1):
ostree: Upgrade 2023.8 -> 2024.1
Jörg Sommer (1):
bonnie++: New recipe for version 2.0
Khem Raj (18):
uftrace: Upgrade to 0.15.2
i2cdev: Set PV correctly
minicoredumper: Fix build with clang
python3-pytest-mock: Fix ptest failures with python 3.12
ndctl: Update to v78
vk-gl-cts: Disable Werror on amber external module
vulkan-cts: Upgrade to 1.3.7.3
uftrace: Adjust the summary to reflect rust and python support
libcamera: Fix build with clang-18
breakpad: Upgrade to 2023.06.01 release
bpftool: Add missing dep on elfutils-native
flatcc: Fix build warnings found with clang-18
Revert "lzop: add (from oe-core)"
can-isotp: Update to latest and skip it
openflow: Switch SRC_URI to github mirror
ot-br-posix: upgrade to latest trunk
libcereal: Disable c++11-narrowing-const-reference warning as error
ot-br-posix: Limit vla-cxx-extension option to clang >= 18
Li Wang (1):
radvd: add '--shell /sbin/nologin' to /etc/passwd
Mark Hatle (1):
opencv: Fix python3 package generation
Markus Volk (9):
luajit: allow to build on supported platforms
pipewire: fix build with libcamera-0.2
system-config-printer: fix runtime for system-config-printer
iwd: update 2.8 -> 2.13
pipewire: update 1.0.1 -> 1.0.3
flatpak: remove unneeded RDEPENDS
libosinfo: use hwdata for ids files
libnfs: update 5.0.2 -> 5.0.3
hwdata: update 0.378 -> 0.379
Martin Jansa (18):
libtalloc, libtevent, libtdb, libldb: set PYTHONARCHDIR for waf to respect python libdir
jack: fix build with python3 on host
redis: restore Upstream-Status
libvpx: restore Upstream-Status
python-jsonref: add missing Upstream-Status
flatcc: respect baselib
flatcc: drop 'r' from gitr and ${SRCPV}
recipes: drop ${SRCPV} usage
recipes: drop remaining +gitr cases
gitpkgv.bbclass: adjust the example in comment a bit
ne10: append +git instead of gitr+
evemu-tools: use better PV
nana: upgrade to latest commit from github
xfstests: upgrade to latest 2024.01.14
xfstests: add gawk to RDEPENDS
xfstests: use master branch instead of 'for-next'
xfstests: drop the upstream rejected install-sh hack
xfstests: fix make install race condition
Max Krummenacher (2):
libusbgx: fix usbgx.service stop / restart
libusbgx: uprev to the latest commit
Maxime Roussin-Belanger (1):
xdg-desktop-portal: add missing glib-2.0-native dependency
Maxime Roussin-Bélanger (1):
polkit: fix rules.d permissions
Ming Liu (1):
plymouth: uprev to 24.004.60
Niko Mauno (4):
python3-pybind11: Amend HOMEPAGE
python3-pybind11: Prune redundant inherit
python3-pybind11: Fix LICENSE
python3-pybind11: Cosmetic fixes
Pavel Zhukov (1):
python3-tzlocal: Add zoneinfo dependency
Peter Kjellerstedt (1):
xfstests: Only specify the main SRCREV once
Peter Marko (2):
syslog-ng: ignore CVE-2022-38725
libqmi: correct PV
Pratik Manvar (1):
python3-pybind11: Remove the Boost dependency
Richard Leitner (7):
python3-janus: add recipe for v1.0.0
python3-moteus: add recipe for v0.3.67
python3-socksio: add recipe for v1.0.0
python3-anyio: add recipe for v4.2.0
python3-sniffio: add recipe for v1.3.0
python3-httpcore: add recipe for v1.0.2
python3-httpx: add recipe for v0.26.0
Sascha Hauer (1):
signing.bbclass: make it work with eliptic curve keys
Simone Weiß (1):
scapy: Add difftools and logutils in RDEPENDS
Thomas Perrot (3):
dvb-apps: no longer skip ldflags QA
etcd-cpp-apiv3: no longer skip ldflags QA
kernel-selftest: no longer skip ldflags QA
Tim Orling (60):
python3-uritemplate: switch to pytest --automake
python3-unidiff: switch to pytest --automake
python3-ujson: switch to pytest --automake
python3-pytest-lazy-fixture: switch to pytest --automake
python3-fastjsonschema: switch to pytest --automake
python3-tomlkit: switch to pytest --automake
python3-inotify: switch to pytest --automake
python3-requests-file: switch to pytest --automake
python3-covdefaults: switch to pytest --automake
python3-dominate: switch to pytest --automake
python3-scrypt: switch to pytest --automake
python3-u-msgpack-python: switch to pytest --automake
python3-iso3166: switch to pytest --automake
python3-trustme: switch to pytest --automake
python3-asgiref: switch to pytest --automake
python3-html2text: switch to pytest --automake
python3-pyasn1-modules: switch to pytest --automake
python3-intervals: switch to pytest --automake
python3-py-cpuinfo: switch to pytest --automake
python3-backports-functools-lru-cache: drop folder
python3-whoosh: switch to pytest --automake
python3-xlrd: switch to pytest --automake
python3-dnspython: switch to pytest --automake
python3-prettytable: switch to pytest --automake
python3-ptyprocess: switch to pytest --automake
python3-gunicorn: switch to pytest --automake
python3-pytest-mock: switch to pytest --automake
python3-pyroute2: switch to pytest --automake
python3-smpplib: switch to pytest --automake
python3-pyzmq: switch to pytest --automake
python3-multidict: switch to pytest --automake
python3-geojson: switch to pytest --automake
python3-serpent: switch to pytest --automake
python3-soupsieve: switch to pytest --automake
python3-requests-toolbelt: switch to pytest --automake
python3-yarl: switch to pytest --automake
python3-cbor2: switch to pytest --automake
python3-ansicolors: switch to pytest --automake
python3-ipy: switch to pytest --automake
python3-sqlparse: switch to pytest --automake
python3-precise-runner: switch to pytest --automake
python3-parse-type: switch to pytest --automake
python3-inflection: switch to pytest --automake
python3-blinker: switch to pytest --automake
python3-service-identity: switch to pytest --automake
python3-cachetools: switch to pytest --automake
python3-simpleeval: switch to pytest --automake
python3-appdirs: switch to pytest --automake
python3-pillow: switch to pytest --automake
python3-semver: switch to pytest --automake
python3-platformdirs: switch to pytest --automake
python3-polyline: switch to pytest --automake
python3-betamax: switch to pytest --automake
python3-pytoml: switch to pytest --automake
python3-pyserial: switch to pytest --automake
python3-typeguard: switch to pytest --automake
python3-execnet: switch to pytest --automake
python3-pyyaml-include: switch to pytest --automake
python3-xxhash: switch to pytest --automake
python3-pylint: switch to pytest --automake
Tom Geelen (1):
python3-pychromecast: add missing RDEPENDS, and add initial recipe for dependency.
Wang Mingyu (90):
btop: upgrade 1.2.13 -> 1.3.0
ccid: upgrade 1.5.4 -> 1.5.5
ctags: upgrade 6.1.20231231.0 -> 6.1.20240114.0
gcr3: upgrade 3.41.1 -> 3.41.2
htop: upgrade 3.2.2 -> 3.3.0
hwdata: upgrade 0.377 -> 0.378
libdecor: upgrade 0.2.1 -> 0.2.2
libvpx: upgrade 1.13.1 -> 1.14.0
lldpd: upgrade 1.0.17 -> 1.0.18
gjs: upgrade 1.78.2 -> 1.78.3
wireshark: upgrade 4.2.0 -> 4.2.2
capnproto: upgrade 1.0.1.1 -> 1.0.2
dnfdragora: upgrade 2.1.5 -> 2.1.6
libyang: upgrade 2.1.128 -> 2.1.148
lshw: upgrade 02.19.2 -> 02.20
md4c: upgrade 0.4.8 -> 0.5.0
python3-apscheduler: add new recipe
redis: upgrade 7.2.3 -> 7.2.4
sanlock: upgrade 3.8.5 -> 3.9.0
python3-eth-keys: upgrade 0.4.0 -> 0.5.0
python3-xmlschema: upgrade 2.5.1 -> 3.0.1
plocate: upgrade 1.1.20 -> 1.1.22
python3-absl: upgrade 2.0.0 -> 2.1.0
python3-asyncinotify: upgrade 4.0.5 -> 4.0.6
python3-beautifulsoup4: upgrade 4.12.2 -> 4.12.3
python3-cantools: upgrade 39.4.2 -> 39.4.3
python3-cbor2: upgrade 5.5.1 -> 5.6.0
python3-dbus-fast: upgrade 2.21.0 -> 2.21.1
python3-django: upgrade 5.0 -> 5.0.1
python3-eth-abi: upgrade 4.2.1 -> 5.0.0
python3-eth-typing: upgrade 3.5.2 -> 4.0.0
python3-eth-utils: upgrade 2.3.1 -> 3.0.0
python3-eventlet: upgrade 0.34.2 -> 0.34.3
python3-flask: upgrade 3.0.0 -> 3.0.1
python3-git-pw: upgrade 2.5.0 -> 2.6.0
python3-google-api-python-client: upgrade 2.113.0 -> 2.114.0
python3-haversine: upgrade 2.8.0 -> 2.8.1
python3-ipython: upgrade 8.19.0 -> 8.20.0
python3-pdm: upgrade 2.11.2 -> 2.12.1
python3-pyatspi: upgrade 2.46.0 -> 2.46.1
python3-sentry-sdk: upgrade 1.39.1 -> 1.39.2
python3-robotframework: upgrade 6.1.1 -> 7.0
python3-pychromecast: upgrade 13.0.8 -> 13.1.0
python3-tox: upgrade 4.11.4 -> 4.12.1
python3-types-psutil: upgrade 5.9.5.17 -> 5.9.5.20240106
qpdf: upgrade 11.7.0 -> 11.8.0
smemstat: upgrade 0.02.12 -> 0.02.13
tesseract: upgrade 5.3.3 -> 5.3.4
libsmi: Fix buildpaths warning.
minicoredumper: upgrade 2.0.6 -> 2.0.7
cmocka: Fix install conflict when enable multilib.
czmq: Fix install conflict when enable multilib.
czmq: Fix buildpaths warning.
bdwgc: upgrade 8.2.4 -> 8.2.6
cmark: upgrade 0.30.3 -> 0.31.0
gensio: upgrade 2.8.2 -> 2.8.3
geos: upgrade 3.12.0 -> 3.12.1
imlib2: upgrade 1.12.1 -> 1.12.2
libcbor: upgrade 0.10.2 -> 0.11.0
libinih: upgrade 57 -> 58
libio-socket-ssl-perl: upgrade 2.084 -> 2.085
libjcat: upgrade 0.2.0 -> 0.2.1
libqmi: upgrade 1.35.1 -> 1.35.2
md4c: upgrade 0.5.0 -> 0.5.2
nanomsg: upgrade 1.2 -> 1.2.1
neatvnc: upgrade 0.7.1 -> 0.7.2
network-manager-applet: upgrade 1.34.0 -> 1.36.0
libgsf: upgrade 1.14.51 -> 1.14.52
ndisc6: upgrade 1.0.7 -> 1.0.8
squid: upgrade 6.6 -> 6.7
iotop: upgrade 1.25 -> 1.26
libblockdev: upgrade 3.0.4 -> 3.1.0
neon: upgrade 0.32.5 -> 0.33.0
pkcs11-provider: upgrade 0.2 -> 0.3
sanlock: upgrade 3.9.0 -> 3.9.1
satyr: upgrade 0.42 -> 0.43
python3-astroid: upgrade 3.0.2 -> 3.0.3
python3-elementpath: upgrade 4.1.5 -> 4.2.0
python3-flask: upgrade 3.0.1 -> 3.0.2
python3-google-api-core: upgrade 2.16.1 -> 2.16.2
python3-gspread: upgrade 5.12.4 -> 6.0.0
python3-path: upgrade 16.9.0 -> 16.10.0
python3-gcovr: upgrade 6.0 -> 7.0
python3-types-psutil: upgrade 5.9.5.20240106 -> 5.9.5.20240205
python3-waitress: upgrade 2.1.2 -> 3.0.0
rdma-core: upgrade 48.0 -> 50.0
ser2net: upgrade 4.6.0 -> 4.6.1
sip: upgrade 6.8.1 -> 6.8.2
span-lite: upgrade 0.10.3 -> 0.11.0
tcpslice: upgrade 1.6 -> 1.7
William A. Kennington III (3):
nanopb: Update 0.4.7 -> 0.4.8
nanopb: Split into 2 packages
nanopb-runtime: Enable shared library
Yoann Congal (6):
ibus: backport a reproducibility fix
radvd: Fix build in reproducible test
mariadb: Move useradd handling in target side of the recipe
kexec-tools-klibc: Fix building on x86_64 with binutils 2.41
freeradius: Add missing 'radiusd' static group id
ntp: Add missing 'ntp' static group id
alperak (18):
python3-flask-marshmallow: upgrade 0.15.0 -> 1.1.0
python3-netaddr: upgrade 0.10.0 -> 0.10.1
python3-toolz: upgrade 0.12.0 -> 0.12.1
python3-aiohappyeyeballs: add recipe
python3-aiohttp: upgrade 3.9.1 -> 3.9.2
python3-eth-rlp: upgrade 1.0.0 -> 1.0.1
python3-aiohttp: upgrade 3.9.2 -> 3.9.3
python3-google-auth-oauthlib: add recipe
python3-scikit-build: upgrade 0.16.7 -> 0.17.6
python3-eth-account: upgrade 0.10.0 -> 0.11.0
python3-pyunormalize: add recipe
python3-web3: upgrade 6.15.0 -> 6.15.1
python3-gspread: upgrade 6.0.0 -> 6.0.1
python3-strenum: add recipe
python3-flask-marshmallow: upgrade 1.1.0 -> 1.2.0
python3-werkzeug: upgrade 2.3.6 -> 3.0.1
python3-imageio: upgrade 2.33.1 -> 2.34.0
python3-werkzeug: add missing runtime dependencies
virendra thakur (1):
nodejs: Set CVE_PRODUCT to "node.js"
Change-Id: If9fadba6ede9e8de3b778d470bbd61f208f48e54
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-openembedded')
524 files changed, 3837 insertions, 2628 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index 6bf321e237..7228172b80 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://utils/mkyaffs2image.c;beginline=11;endline=13;md5=5f5 file://utils/mkyaffsimage.c;beginline=10;endline=12;md5=5f5464f9b3e981ca574e65b00e438561 \ " -PV = "0.0+git${SRCPV}" +PV = "0.0+git" DEPENDS = "mtd-utils" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index fbf7753b02..ad846af470 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -19,7 +19,7 @@ SRC_URI[aufs_type.sha256sum] = "7ff6566adb9c7a3b6862cdc85a690ab546f1d0bc81ddd595 UPSTREAM_CHECK_COMMITS = "1" -PV = "4.9+git${SRCPV}" +PV = "4.9+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb new file mode 100644 index 0000000000..caf0025c8e --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb @@ -0,0 +1,25 @@ +SUMMARY = "Set of GPL'ed utilities to ext2/ext3 filesystem." +DESCRIPTION = "e2tools is a simple set of GPL'ed utilities to read, write, \ +and manipulate files in an ext2/ext3 filesystem. These utilities access a \ +filesystem directly using the ext2fs library. Can also be used on a Linux \ +machine to read/write to disk images or floppies without having to mount \ +them or have root access." +HOMEPAGE = "https://github.com/e2tools/e2tools" +SECTION = "base" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS += "e2fsprogs" + +PV = "0.1.0+git" + +SRC_URI = " \ + git://github.com/e2tools/e2tools;protocol=https;branch=master \ +" +SRCREV = "fd092754a6b65c3a769f74f888668c066f09c36d" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb index ca2ec9cc4f..47613207af 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 @@ -7,7 +7,7 @@ SRC_URI = "\ git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \ " -PV = "1.0+git${SRCPV}" +PV = "1.0+git" SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch deleted file mode 100644 index 5e9e9d9a79..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0927d0def968ea7e19905c7e39182f65961c11cf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 5 Nov 2023 01:17:52 -0700 -Subject: [PATCH] ltp/fsx.h: Explicitly use int for return type for aio_rw() - -Fixes build with clang-17+ -error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] - -Upstream-Status: Submitted [https://marc.info/?l=fstests&m=169917222008646&w=2] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - ltp/fsx.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ltp/fsx.c b/ltp/fsx.c -index ee4b8fe4..c0aec23f 100644 ---- a/ltp/fsx.c -+++ b/ltp/fsx.c -@@ -2581,7 +2581,7 @@ out_error: - return -1; - } - #else --aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) -+int aio_rw(int rw, int fd, char *buf, unsigned len, unsigned offset) - { - fprintf(stderr, "io_rw: need AIO support!\n"); - exit(111); --- -2.42.1 - diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch index 856fd270f5..e823297343 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch @@ -1,4 +1,4 @@ -From 559f685f83d12d11bf9ec6c6ce924ee4d0702a2a Mon Sep 17 00:00:00 2001 +From 79c4715a46b80653eb98b61731c094c85e969220 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 14 Aug 2022 13:33:05 -0700 Subject: [PATCH] Drop detached_mounts_propagation and remove sys/mount.h from @@ -12,21 +12,20 @@ testcase Upstream-Status: Inappropriate [Libc specific Workaround] Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 2815f919..448fccc9 100644 +index e7442487..970f087a 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -32,7 +32,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ +@@ -33,7 +33,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ dio-invalidate-cache stat_test t_encrypted_d_revalidate \ attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \ fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \ - detached_mounts_propagation ext4_resize t_readdir_3 splice2pipe \ + ext4_resize t_readdir_3 splice2pipe \ - uuid_ioctl + uuid_ioctl t_snapshot_deleted_subvolume EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0003-tests-Makefile-make-sure-group.list-DIRT-exists-befo.patch b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0003-tests-Makefile-make-sure-group.list-DIRT-exists-befo.patch new file mode 100644 index 0000000000..5e8bf0c606 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests/0003-tests-Makefile-make-sure-group.list-DIRT-exists-befo.patch @@ -0,0 +1,239 @@ +From b30d5690d7245aa8bd5ca2896e629e62ec97afda Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Thu, 8 Feb 2024 23:01:36 +0100 +Subject: [PATCH] tests/*/Makefile: make sure group.list DIRT exists before + install +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* sometimes make install was failing with: + cp: cannot stat 'group.list': No such file or directory + and bunch of non-fatal messages: + mv: failed to preserve ownership for 'group.list': Invalid argument + +* this was when tools/mkgroupfile did + mv -f "$new_groups" "$groupfile" + overwritting the group.list file while install-sh was already + copying it to output + +* in the end easily reproducible by + 1) removing tests/*/group.list before each make install + 2) adding some sleep in mkgroupfile before the mv call + +Upstream-Status: Submitted [https://lore.kernel.org/fstests/20240208225241.644701-1-martin.jansa@gmail.com/] + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- + tests/btrfs/Makefile | 2 +- + tests/ceph/Makefile | 2 +- + tests/cifs/Makefile | 2 +- + tests/ext4/Makefile | 2 +- + tests/f2fs/Makefile | 2 +- + tests/generic/Makefile | 2 +- + tests/nfs/Makefile | 2 +- + tests/ocfs2/Makefile | 2 +- + tests/overlay/Makefile | 2 +- + tests/perf/Makefile | 2 +- + tests/selftest/Makefile | 2 +- + tests/shared/Makefile | 2 +- + tests/tmpfs/Makefile | 2 +- + tests/udf/Makefile | 2 +- + tests/xfs/Makefile | 2 +- + 15 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/tests/btrfs/Makefile b/tests/btrfs/Makefile +index 1b72a1a1..6d9995b4 100644 +--- a/tests/btrfs/Makefile ++++ b/tests/btrfs/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/ceph/Makefile b/tests/ceph/Makefile +index 2761e1e9..5f24d518 100644 +--- a/tests/ceph/Makefile ++++ b/tests/ceph/Makefile +@@ -12,7 +12,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/cifs/Makefile b/tests/cifs/Makefile +index 62c48935..0b89a01d 100644 +--- a/tests/cifs/Makefile ++++ b/tests/cifs/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/ext4/Makefile b/tests/ext4/Makefile +index a2a0d561..296e3850 100644 +--- a/tests/ext4/Makefile ++++ b/tests/ext4/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/f2fs/Makefile b/tests/f2fs/Makefile +index 9d1ed3c6..0a90b465 100644 +--- a/tests/f2fs/Makefile ++++ b/tests/f2fs/Makefile +@@ -15,7 +15,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/generic/Makefile b/tests/generic/Makefile +index b464b22b..d6ed3e55 100644 +--- a/tests/generic/Makefile ++++ b/tests/generic/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/nfs/Makefile b/tests/nfs/Makefile +index 128d2a3a..51590b5c 100644 +--- a/tests/nfs/Makefile ++++ b/tests/nfs/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/ocfs2/Makefile b/tests/ocfs2/Makefile +index 260ad31b..17e01bf3 100644 +--- a/tests/ocfs2/Makefile ++++ b/tests/ocfs2/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/overlay/Makefile b/tests/overlay/Makefile +index 2785b94d..c71e78d6 100644 +--- a/tests/overlay/Makefile ++++ b/tests/overlay/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/perf/Makefile b/tests/perf/Makefile +index 0c74ba39..d72c04d9 100644 +--- a/tests/perf/Makefile ++++ b/tests/perf/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/selftest/Makefile b/tests/selftest/Makefile +index 3ddfca37..cabc35a9 100644 +--- a/tests/selftest/Makefile ++++ b/tests/selftest/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/shared/Makefile b/tests/shared/Makefile +index f3128714..2e6aa718 100644 +--- a/tests/shared/Makefile ++++ b/tests/shared/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/tmpfs/Makefile b/tests/tmpfs/Makefile +index 46544313..46b62dad 100644 +--- a/tests/tmpfs/Makefile ++++ b/tests/tmpfs/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/udf/Makefile b/tests/udf/Makefile +index ed4434f0..feda69a6 100644 +--- a/tests/udf/Makefile ++++ b/tests/udf/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) +diff --git a/tests/xfs/Makefile b/tests/xfs/Makefile +index 5f413e67..6bfafdb1 100644 +--- a/tests/xfs/Makefile ++++ b/tests/xfs/Makefile +@@ -14,7 +14,7 @@ default: $(DIRT) + + include $(BUILDRULES) + +-install: ++install: default + $(INSTALL) -m 755 -d $(TARGET_DIR) + $(INSTALL) -m 755 $(TESTS) $(TARGET_DIR) + $(INSTALL) -m 644 group.list $(TARGET_DIR) diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb index 4e8e318409..2800a4c30f 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfstests/xfstests_2024.01.14.bb @@ -2,21 +2,20 @@ SUMMARY = "File system QA test suite" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=74274e8a218423e49eefdea80bc55038" -SRCREV = "11914614784735c504f43b5b6baabaa713375984" -SRCREV_FORMAT = "xfstests_unionmount" +SRCREV = "c46ca4d1f6c0c45f9a3ea18bc31ba5ae89e02c70" +SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" +SRCREV_FORMAT = "default_unionmount" -SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=for-next;name=xfstests \ +SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=master \ git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ - file://0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch \ - file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \ + file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ + file://0003-tests-Makefile-make-sure-group.list-DIRT-exists-befo.patch \ " -SRCREV_xfstests = "f7765774a1b5cb98c2f21a892e82b3421f40e791" -SRCREV_unionmount = "e3825b16b46f4c4574a1a69909944c059835f914" - S = "${WORKDIR}/git" +# brokensep because m4/package_globals.m4 calls ". ./VERSION" (and that's not the only issue) inherit autotools-brokensep useradd DEPENDS += "xfsprogs acl" @@ -35,6 +34,7 @@ RDEPENDS:${PN} += "\ python3-core \ xfsprogs \ acl \ + gawk \ " USERADD_PACKAGES = "${PN}" @@ -44,23 +44,23 @@ USERADD_PARAM:${PN} = "-U -m fsgqa; -N 123456-fsgqa; -N fsgqa2" EXTRA_OECONF = "INSTALL_USER=root INSTALL_GROUP=root" TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE" -# install-sh script in the project is outdated -# we use the one from the latest libtool to solve installation issues -# It looks like the upstream is not interested in having it fixed :( -# https://www.spinics.net/lists/fstests/msg16981.html + do_configure:prepend() { - cp ${STAGING_DIR_NATIVE}${datadir}/libtool/build-aux/install-sh ${B} + # this is done by Makefile configure target, but we don't call it in do_configure + cp -a ${S}/include/install-sh . } -do_install:append() { - unionmount_target_dir=${D}/usr/xfstests/unionmount-testsuite - install -d ${D}/usr/xfstests/unionmount-testsuite/tests - install -D ${WORKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests +do_install() { + # otherwise install-sh duplicates DESTDIR prefix + export DIST_ROOT="/" DIST_MANIFEST="" DESTDIR="${D}" + oe_runmake install + + unionmount_target_dir=${D}${prefix}/xfstests/unionmount-testsuite + install -d $unionmount_target_dir/tests + install ${WORKDIR}/unionmount-testsuite/tests/* -t $unionmount_target_dir/tests install ${WORKDIR}/unionmount-testsuite/*.py -t $unionmount_target_dir install ${WORKDIR}/unionmount-testsuite/run -t $unionmount_target_dir install ${WORKDIR}/unionmount-testsuite/README -t $unionmount_target_dir } -FILES:${PN} += "\ - /usr/xfstests \ -" +FILES:${PN} += "${prefix}/xfstests" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.34.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb index 312d759dbf..5f1f05cb2c 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb @@ -10,7 +10,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 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] = "ab368e470f6b161fc8b834bc97912b7e79af92b8cd7ea399c2d400ce89aba5a8" +SRC_URI[archive.sha256sum] = "a84704487ea3afe1485c47fb2ab598b8f779f540ae0dcbf0a1c5f85e64a7e253" # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb index 01900cce39..90c12efadf 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ DEPENDS = "gtk+ glib-2.0 libwnck libxinerama lua virtual/libx11" -PV .= "+git${SRCPV}" +PV .= "+git" SRCREV = "b9d7ad9c09a5fb17a1562ee1d892798c646e9ec9" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.78.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.78.3.bb index c8ffcdaabe..59d0a7b874 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.78.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.78.3.bb @@ -7,7 +7,7 @@ DEPENDS = "mozjs-115 cairo" inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even pkgconfig -SRC_URI[archive.sha256sum] = "6a2abeb6bb7b49dd20a2e86475a56c1d992ad271a0991e58b1431ad1d4997fd5" +SRC_URI[archive.sha256sum] = "42d50364caa5d792c76734fe5bbcc4b9dbb48819da20a4060061e8b9526134a4" SRC_URI += " \ file://0001-Support-cross-builds-a-bit-better.patch \ file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.51.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb index 5ee73f5638..7e1842b1ac 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.51.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb @@ -9,7 +9,7 @@ DEPENDS= "libxml2 bzip2 glib-2.0 zlib" GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gobject-introspection gettext gtk-doc -SRC_URI[archive.sha256sum] = "f0b83251f98b0fd5592b11895910cc0e19f798110b389aba7da1cb7c474017f5" +SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0" SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" PACKAGECONFIG ??= "" diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc index 9579404b3e..9d0600c794 100644 --- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -12,6 +12,7 @@ DEPENDS = "unicode-ucd" SRC_URI = " \ git://github.com/ibus/ibus.git;branch=main;protocol=https \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ + file://0001-makefile-don-t-gzip-the-man-pages.patch \ " SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch new file mode 100644 index 0000000000..105e34873a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch @@ -0,0 +1,164 @@ +From 5307c3b310fabeaa52fafe743c5efaca73ccce46 Mon Sep 17 00:00:00 2001 +From: Emil Velikov <emil.l.velikov@gmail.com> +Date: Sun, 11 Jun 2023 16:16:35 +0900 +Subject: [PATCH] makefile: don't gzip the man pages + +Drop the gzip step from the manpages - distributions already do that as +needed. In addition this resolves the final reproducibility issue with +ibus. + +BUG=https://github.com/ibus/ibus/pull/2514 + +Upstream-Status: Backport [https://github.com/ibus/ibus/commit/1a25975d9f55f18eab609e4d147dd32689e367f3] +Note: This commit is included in version >= 1.5.29 and can be dropped +after upgrading. +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +--- + bus/Makefile.am | 6 +----- + data/dconf/Makefile.am | 6 +----- + setup/Makefile.am | 6 +----- + tools/Makefile.am | 6 +----- + ui/gtk3/Makefile.am | 6 +----- + 5 files changed, 5 insertions(+), 25 deletions(-) + +diff --git a/bus/Makefile.am b/bus/Makefile.am +index e173ee25..d0445d02 100644 +--- a/bus/Makefile.am ++++ b/bus/Makefile.am +@@ -169,7 +169,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_one_DATA) \ +- $(man_one_files) \ + $(NULL) + + $(libibus): +@@ -181,14 +180,11 @@ test: ibus-daemon + $(builddir)/ibus-daemon -v + + man_one_in_files = ibus-daemon.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + -include $(top_srcdir)/git.mk +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 5360f033..2352f770 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -38,15 +38,12 @@ dconfdb_DATA = 00-upstream-settings + { rc=$$?; $(RM) -rf $@; exit $$rc; } + + man_5_in_files = 00-upstream-settings.5.in ibus.5.in +-man_5_files = $(man_5_in_files:.5.in=.5) +-man_5_DATA =$(man_5_files:.5=.5.gz) ++man_5_DATA = $(man_5_in_files:.5.in=.5) + man_5dir = $(mandir)/man5 + %.5: %.5.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.5.gz: %.5 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + install-data-hook: + if test -z "$(DESTDIR)"; then \ +@@ -63,7 +60,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_5_DATA) \ +- $(man_5_files) \ + $(NULL) + + MAINTAINERCLEANFILES = \ +diff --git a/setup/Makefile.am b/setup/Makefile.am +index 34c8f136..b34aa8fc 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -56,20 +56,16 @@ org.freedesktop.IBus.Setup.desktop: ibus-setup.desktop + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + + man_one_in_files = ibus-setup.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + CLEANFILES = \ + $(desktop_DATA) \ + $(man_one_DATA) \ +- $(man_one_files) \ + *.pyc \ + ibus-setup \ + $(NULL) +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 5c18d3d6..1c716136 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -79,15 +79,12 @@ bash_completion_DATA= \ + bash_completiondir=@datadir@/bash-completion/completions + + man_one_in_files = ibus.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + EXTRA_DIST = \ + $(man_one_in_files) \ +@@ -96,7 +93,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_one_DATA) \ +- $(man_one_files) \ + $(NULL) + + if ENABLE_EMOJI_DICT +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index ab379328..aff035da 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -242,15 +242,12 @@ panelbinding.o: $(srcdir)/panelbinding.c + + MAINTAINERCLEANFILES += extension.c panelbinding.c + +-man_seven_files = $(man_seven_in_files:.7.in=.7) +-man_seven_DATA =$(man_seven_files:.7=.7.gz) ++man_seven_DATA = $(man_seven_in_files:.7.in=.7) + man_sevendir = $(mandir)/man7 + %.7: %.7.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.7.gz: %.7 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + desktop_in_files = \ + ibus-ui-emojier.desktop.in \ +@@ -278,7 +275,6 @@ CLEANFILES += \ + $(desktop_DATA) \ + $(desktop_notrans_files) \ + $(man_seven_DATA) \ +- $(man_seven_files) \ + $(NULL) + + endif diff --git a/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb b/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb index 278592dc6e..7960009078 100644 --- a/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb +++ b/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f18f9c6d8b4cfcc7d7804a243a4c0b4" S = "${WORKDIR}/git" SRCREV = "736ccef40d39603b8111c8a3a0bca0319bbafdc0" -PV = "3.0+git${SRCPV}" +PV = "3.0+git" SRC_URI = "git://github.com/engla/keybinder.git;branch=keybinder-3.0;protocol=https \ " diff --git a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb index 62d1effccc..a92c0e8966 100644 --- a/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "kexecboot is a graphical linux-as-bootloader implementation based HOMEPAGE = "https://github.com/kexecboot/kexecboot/wiki" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PV = "0.6+git${SRCPV}" +PV = "0.6+git" S = "${WORKDIR}/git" SRC_URI = "git://github.com/kexecboot/kexecboot.git;branch=master;protocol=https" SRC_URI:append:libc-klibc = "\ diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/Fix-building-on-x86_64-with-binutils-2.41.patch b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/Fix-building-on-x86_64-with-binutils-2.41.patch new file mode 100644 index 0000000000..4894f044fc --- /dev/null +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc/Fix-building-on-x86_64-with-binutils-2.41.patch @@ -0,0 +1,95 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michel Lind <salimma@fedoraproject.org> +Date: Tue, 30 Jan 2024 04:14:31 -0600 +Subject: [PATCH] Fix building on x86_64 with binutils 2.41 + +Newer versions of the GNU assembler (observed with binutils 2.41) will +complain about the ".arch i386" in files assembled with "as --64", +with the message "Error: 64bit mode not supported on 'i386'". + +Fix by moving ".arch i386" below the relevant ".code32" directive, so +that the assembler is no longer expecting 64-bit instructions to be used +by the time that the ".arch i386" directive is encountered. + +Based on similar iPXE fix: +https://github.com/ipxe/ipxe/commit/6ca597eee + +Signed-off-by: Michel Lind <michel@michel-slm.name> +Signed-off-by: Simon Horman <horms@kernel.org> + +Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?h=main&id=328de8e00e298f00d7ba6b25dc3950147e9642e6] +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +--- + purgatory/arch/i386/entry32-16-debug.S | 2 +- + purgatory/arch/i386/entry32-16.S | 2 +- + purgatory/arch/i386/entry32.S | 2 +- + purgatory/arch/i386/setup-x86.S | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S +index 5167944..12e1164 100644 +--- a/purgatory/arch/i386/entry32-16-debug.S ++++ b/purgatory/arch/i386/entry32-16-debug.S +@@ -25,10 +25,10 @@ + .globl entry16_debug_pre32 + .globl entry16_debug_first32 + .globl entry16_debug_old_first32 +- .arch i386 + .balign 16 + entry16_debug: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S +index c051aab..eace095 100644 +--- a/purgatory/arch/i386/entry32-16.S ++++ b/purgatory/arch/i386/entry32-16.S +@@ -20,10 +20,10 @@ + #undef i386 + .text + .globl entry16, entry16_regs +- .arch i386 + .balign 16 + entry16: + .code32 ++ .arch i386 + /* Compute where I am running at (assumes esp valid) */ + call 1f + 1: popl %ebx +diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S +index f7a494f..8ce9e31 100644 +--- a/purgatory/arch/i386/entry32.S ++++ b/purgatory/arch/i386/entry32.S +@@ -20,10 +20,10 @@ + #undef i386 + + .text +- .arch i386 + .globl entry32, entry32_regs + entry32: + .code32 ++ .arch i386 + + /* Setup a gdt that should that is generally usefully */ + lgdt %cs:gdt +diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S +index 201bb2c..a212eed 100644 +--- a/purgatory/arch/i386/setup-x86.S ++++ b/purgatory/arch/i386/setup-x86.S +@@ -21,10 +21,10 @@ + #undef i386 + + .text +- .arch i386 + .globl purgatory_start + purgatory_start: + .code32 ++ .arch i386 + + /* Load a gdt so I know what the segment registers are */ + lgdt %cs:gdt +-- +2.39.2 + diff --git a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb index 5c7e84cc99..363cdb9adf 100644 --- a/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb +++ b/meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_git.bb @@ -5,7 +5,7 @@ SECTION = "kernel/userland" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a \ file://kexec/kexec.c;beginline=1;endline=20;md5=af10f6ae4a8715965e648aa687ad3e09" -PV = "2.0.18+git${SRCPV}" +PV = "2.0.18+git" DEPENDS = "zlib xz" @@ -15,7 +15,9 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git;branc SRCREV = "5750980cdbbc33ef75bfba6660295b932376ce15" BUILD_PATCHES = "file://0001-force-static-build.patch \ - file://0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch" + file://0002-Adjust-the-order-of-headers-to-fix-build-for-musl.patch \ + file://Fix-building-on-x86_64-with-binutils-2.41.patch \ + " KLIBC_PATCHES += " \ file://0003-kexec-elf-rel-use-our-elf.h.patch \ diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb index bd2df5d8d6..8fbf9ab2c8 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb @@ -9,7 +9,7 @@ DEPENDS = "libusb1 openssl pcsc-lite" SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ " SRCREV = "11718" -PV = "1.10+${SRCPV}" +PV = "1.10+" S = "${WORKDIR}/trunk" diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index d64ee96f78..2d79777001 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/tvheadend/tvheadend.git;branch=master;protocol=https " SRCREV = "cc602833684953fc3e6f1c89d4f08f6dfef179e3" -PV = "4.3+git${SRCPV}" +PV = "4.3+git" PKGV = "4.3+git${GITPKGV}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb index ab0d8bca9f..5007c88fff 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8449a4f133a93f6254b496d4fb476e83" SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master" SRCREV = "dd05a1baa261b94da9ba977b5e3392c8b4dc7a5e" -PV = "4.0.0+git${SRCPV}" +PV = "4.0.0+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb index 719aecede1..b0a347f252 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dleyna/dleyna-server_0.6.0.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "glib-2.0 gssdp gupnp gupnp-av gupnp-dlna libsoup-2.4 libxml2 dleyna-core" RDEPENDS:${PN} = "dleyna-connector-dbus" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://github.com/01org/${BPN}.git;branch=master;protocol=https" SRCREV = "eb895ae82715e9889a948ffa810c0f828b4f4c76" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb index 90a69e5e23..542ad3487b 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb @@ -96,7 +96,4 @@ python populate_packages:prepend () { do_split_packages(d, dvb_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True) } -INSANE_SKIP:${PN} = "ldflags" -INSANE_SKIP:${PN}-dev = "ldflags" - TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-media_device-Add-bool-return-type-to-unlock.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-media_device-Add-bool-return-type-to-unlock.patch new file mode 100644 index 0000000000..12f034effd --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-media_device-Add-bool-return-type-to-unlock.patch @@ -0,0 +1,59 @@ +From 6914c4fd3d53c0c6ea304123bf57429bb64ec16f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Jan 2024 21:01:27 -0800 +Subject: [PATCH 1/2] media_device: Add bool return type to unlock() + +unlock uses lockf which is marked with __attribute__ +((warn_unused_result)) and compilers warn about it and some treat +-Wunused-result as error with -Werror turned on, It would be good to +check if lockf failed or succeeded, however, that piece is not changed +with this, this fixes build with clang++ 18 + + ../git/src/libcamera/media_device.cpp:167:2: error: ignoring return value of function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result] + 167 | lockf(fd_.get(), F_ULOCK, 0); + | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~ + 1 error generated. + +Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040380.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/libcamera/internal/media_device.h | 2 +- + src/libcamera/media_device.cpp | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h +index eb8cfde4..b09dfd16 100644 +--- a/include/libcamera/internal/media_device.h ++++ b/include/libcamera/internal/media_device.h +@@ -33,7 +33,7 @@ public: + bool busy() const { return acquired_; } + + bool lock(); +- void unlock(); ++ bool unlock(); + + int populate(); + bool isValid() const { return valid_; } +diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp +index 2949816b..eaa2fdb0 100644 +--- a/src/libcamera/media_device.cpp ++++ b/src/libcamera/media_device.cpp +@@ -159,12 +159,12 @@ bool MediaDevice::lock() + * + * \sa lock() + */ +-void MediaDevice::unlock() ++bool MediaDevice::unlock() + { + if (!fd_.isValid()) +- return; ++ return false; + +- lockf(fd_.get(), F_ULOCK, 0); ++ return lockf(fd_.get(), F_ULOCK, 0) == 0; + } + + /** +-- +2.43.0 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-mojom-Drop-using-imp-module.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-mojom-Drop-using-imp-module.patch deleted file mode 100644 index b07a790596..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-mojom-Drop-using-imp-module.patch +++ /dev/null @@ -1,176 +0,0 @@ -From 23a9bbb9ab380344c5daf5bc0109fab249e41afd Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 30 Dec 2023 10:55:44 -0800 -Subject: [PATCH] mojom: Drop using imp module. - -This module is gone in python 3.12 onwards, in most places it is unused -so remove from those places, in some places where its still is needed -replace it with importlib.util - -Fixes [1] - -[1] https://bugs.libcamera.org/show_bug.cgi?id=206 - -Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2023-December/039986.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - utils/ipc/mojo/public/tools/mojom/mojom/fileutil.py | 1 - - .../ipc/mojo/public/tools/mojom/mojom/fileutil_unittest.py | 1 - - .../tools/mojom/mojom/generate/generator_unittest.py | 7 ++----- - .../tools/mojom/mojom/generate/translate_unittest.py | 1 - - .../mojo/public/tools/mojom/mojom/parse/ast_unittest.py | 1 - - .../mojom/mojom/parse/conditional_features_unittest.py | 7 ++----- - utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer.py | 1 - - .../mojo/public/tools/mojom/mojom/parse/lexer_unittest.py | 6 ++---- - .../mojo/public/tools/mojom/mojom/parse/parser_unittest.py | 1 - - 9 files changed, 6 insertions(+), 20 deletions(-) - -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/fileutil.py b/utils/ipc/mojo/public/tools/mojom/mojom/fileutil.py -index bf626f54..e1c823da 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/fileutil.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/fileutil.py -@@ -3,7 +3,6 @@ - # found in the LICENSE file. - - import errno --import imp - import os.path - import sys - -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/fileutil_unittest.py b/utils/ipc/mojo/public/tools/mojom/mojom/fileutil_unittest.py -index ff5753a2..e754151f 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/fileutil_unittest.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/fileutil_unittest.py -@@ -2,7 +2,6 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp - import os.path - import shutil - import sys -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/generate/generator_unittest.py b/utils/ipc/mojo/public/tools/mojom/mojom/generate/generator_unittest.py -index 32c884a8..6cae6092 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/generate/generator_unittest.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/generate/generator_unittest.py -@@ -2,7 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp -+import importlib.util - import os.path - import sys - import unittest -@@ -18,10 +18,7 @@ def _GetDirAbove(dirname): - if tail == dirname: - return path - -- --try: -- imp.find_module("mojom") --except ImportError: -+if importlib.util.find_spec("mojom") is None: - sys.path.append(os.path.join(_GetDirAbove("pylib"), "pylib")) - from mojom.generate import generator - -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/generate/translate_unittest.py b/utils/ipc/mojo/public/tools/mojom/mojom/generate/translate_unittest.py -index 19905c8a..09724d88 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/generate/translate_unittest.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/generate/translate_unittest.py -@@ -2,7 +2,6 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp - import os.path - import sys - import unittest -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/parse/ast_unittest.py b/utils/ipc/mojo/public/tools/mojom/mojom/parse/ast_unittest.py -index 62798631..4ab51033 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/parse/ast_unittest.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/parse/ast_unittest.py -@@ -2,7 +2,6 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp - import os.path - import sys - import unittest -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py b/utils/ipc/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py -index aa609be7..f3c2c95f 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/parse/conditional_features_unittest.py -@@ -2,7 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp -+import importlib.util - import os - import sys - import unittest -@@ -18,10 +18,7 @@ def _GetDirAbove(dirname): - if tail == dirname: - return path - -- --try: -- imp.find_module('mojom') --except ImportError: -+if importlib.util.find_spec("mojom") is None: - sys.path.append(os.path.join(_GetDirAbove('pylib'), 'pylib')) - import mojom.parse.ast as ast - import mojom.parse.conditional_features as conditional_features -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer.py b/utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer.py -index 3e084bbf..1e8b49f2 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer.py -@@ -2,7 +2,6 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp - import os.path - import sys - -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py b/utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py -index eadc6587..77976507 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/parse/lexer_unittest.py -@@ -2,7 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp -+import importlib.util - import os.path - import sys - import unittest -@@ -22,9 +22,7 @@ def _GetDirAbove(dirname): - sys.path.insert(1, os.path.join(_GetDirAbove("mojo"), "third_party")) - from ply import lex - --try: -- imp.find_module("mojom") --except ImportError: -+if importlib.util.find_spec("mojom") is None: - sys.path.append(os.path.join(_GetDirAbove("pylib"), "pylib")) - import mojom.parse.lexer - -diff --git a/utils/ipc/mojo/public/tools/mojom/mojom/parse/parser_unittest.py b/utils/ipc/mojo/public/tools/mojom/mojom/parse/parser_unittest.py -index 6d6b7153..7e8acf43 100644 ---- a/utils/ipc/mojo/public/tools/mojom/mojom/parse/parser_unittest.py -+++ b/utils/ipc/mojo/public/tools/mojom/mojom/parse/parser_unittest.py -@@ -2,7 +2,6 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - --import imp - import os.path - import sys - import unittest --- -2.43.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-options-Replace-use-of-VLAs-in-C.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-options-Replace-use-of-VLAs-in-C.patch new file mode 100644 index 0000000000..95f321782e --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0002-options-Replace-use-of-VLAs-in-C.patch @@ -0,0 +1,91 @@ +From c80d273a57547aec9353d888aa316bf6560cf1ba Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Jan 2024 21:04:28 -0800 +Subject: [PATCH 2/2] options: Replace use of VLAs in C++ + +Clang++ 18 is fussy about this with new warning checks. + + ../git/src/apps/common/options.cpp:882:20: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] + 882 | char shortOptions[optionsMap_.size() * 3 + 2]; + | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + +Therefore replace using VLAs with alloca and malloc/free + +Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040381.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/apps/common/options.cpp | 4 ++-- + src/libcamera/ipc_unixsocket.cpp | 12 ++++++++---- + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/src/apps/common/options.cpp b/src/apps/common/options.cpp +index 4f7e8691..b020f603 100644 +--- a/src/apps/common/options.cpp ++++ b/src/apps/common/options.cpp +@@ -879,8 +879,8 @@ OptionsParser::Options OptionsParser::parse(int argc, char **argv) + * Allocate short and long options arrays large enough to contain all + * options. + */ +- char shortOptions[optionsMap_.size() * 3 + 2]; +- struct option longOptions[optionsMap_.size() + 1]; ++ char *shortOptions = (char*)alloca(optionsMap_.size() * 3 + 2); ++ struct option *longOptions = (struct option*)alloca(optionsMap_.size() + 1); + unsigned int ids = 0; + unsigned int idl = 0; + +diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp +index 1980d374..3a7f8ee6 100644 +--- a/src/libcamera/ipc_unixsocket.cpp ++++ b/src/libcamera/ipc_unixsocket.cpp +@@ -247,8 +247,8 @@ int IPCUnixSocket::sendData(const void *buffer, size_t length, + iov[0].iov_base = const_cast<void *>(buffer); + iov[0].iov_len = length; + +- char buf[CMSG_SPACE(num * sizeof(uint32_t))]; +- memset(buf, 0, sizeof(buf)); ++ char *buf = (char*)malloc(CMSG_SPACE(num * sizeof(uint32_t))); ++ memset((void*)buf, 0, sizeof(buf)); + + struct cmsghdr *cmsg = (struct cmsghdr *)buf; + cmsg->cmsg_len = CMSG_LEN(num * sizeof(uint32_t)); +@@ -270,9 +270,11 @@ int IPCUnixSocket::sendData(const void *buffer, size_t length, + int ret = -errno; + LOG(IPCUnixSocket, Error) + << "Failed to sendmsg: " << strerror(-ret); ++ free(buf); + return ret; + } + ++ free(buf); + return 0; + } + +@@ -283,8 +285,8 @@ int IPCUnixSocket::recvData(void *buffer, size_t length, + iov[0].iov_base = buffer; + iov[0].iov_len = length; + +- char buf[CMSG_SPACE(num * sizeof(uint32_t))]; +- memset(buf, 0, sizeof(buf)); ++ char *buf = (char*)malloc(CMSG_SPACE(num * sizeof(uint32_t))); ++ memset((void*)buf, 0, sizeof(buf)); + + struct cmsghdr *cmsg = (struct cmsghdr *)buf; + cmsg->cmsg_len = CMSG_LEN(num * sizeof(uint32_t)); +@@ -305,12 +307,14 @@ int IPCUnixSocket::recvData(void *buffer, size_t length, + if (ret != -EAGAIN) + LOG(IPCUnixSocket, Error) + << "Failed to recvmsg: " << strerror(-ret); ++ free(buf); + return ret; + } + + if (fds) + memcpy(fds, CMSG_DATA(cmsg), num * sizeof(uint32_t)); + ++ free(buf); + return 0; + } + +-- +2.43.0 + 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.2.0.bb index c8ccff6f40..5b2e863369 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.1.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.2.0.bb @@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "\ SRC_URI = " \ git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ - file://0001-mojom-Drop-using-imp-module.patch \ + file://0001-media_device-Add-bool-return-type-to-unlock.patch \ + file://0002-options-Replace-use-of-VLAs-in-C.patch \ " -SRCREV = "960d0c1e19feaf310321c906e14bd5410c6be629" +SRCREV = "89227a428a82e724548399d35c98ea89566f9045" PE = "1" @@ -73,4 +74,3 @@ FILES:${PN}-gst = "${libdir}/gstreamer-1.0" # libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to # both 32 and 64 bit file APIs. GLIBC_64BIT_TIME_FLAGS = "" - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb index fb74881c03..3d631ea0b6 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libsquish/libsquish_git.bb @@ -3,7 +3,7 @@ SUMMARY = "The squish library (abbreviated to libsquish) is an open source DXT c LICENSE = "MIT" LIC_FILES_CHKSUM = "file://alpha.cpp;beginline=3;endline=22;md5=6665e479f71feb92d590ea9ae9b9f6d5" -PV = "1.10+git${SRCPV}" +PV = "1.10+git" SRCREV = "52e7d93c5947f72380521116c05d97c528863ba8" SRC_URI = "git://github.com/OpenELEC/libsquish.git;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb index 3b365444e2..e8b10bc680 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "expat libxml2 libxml2-native neon neon-native libmusicbrainz-native" -PV = "5.1.0+git${SRCPV}" +PV = "5.1.0+git" SRCREV = "8be45b12a86bc0e46f2f836c8ac88e1e98d82aee" SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.1.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.3.bb index a312594ada..f1c9f85569 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.1.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.3.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "79b98884af80329f59596906231da5597bcdb7b6" +SRCREV = "6ab86209f23a841de7eac6bc0c1009aceb9ffd87" SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb b/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb index 8f0ad65120..df688bbcda 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/gst-instruments/gst-instruments_git.bb @@ -6,7 +6,7 @@ LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" DEPENDS = "gstreamer1.0" SRCREV = "cb8977a6711657e32853159cd539d1d75fcbc772" -PV = "0.3.1+git${SRCPV}" +PV = "0.3.1+git" SRC_URI = "git://github.com/kirushyk/gst-instruments.git;protocol=https;branch=master" diff --git a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb index cee9078844..bff16b4412 100644 --- a/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb +++ b/meta-openembedded/meta-networking/dynamic-layers/meta-python/recipes-printing/system-config-printer/system-config-printer_1.5.18.bb @@ -23,6 +23,9 @@ do_configure:prepend() { } do_install:append() { + cp -rf ${B}/cupshelpers.egg-info ${D}${PYTHON_SITEPACKAGES_DIR} + cp -rf ${B}/cupshelpers ${D}${PYTHON_SITEPACKAGES_DIR} + rm -rf ${D}${PYTHON_SITEPACKAGES_DIR}/*.egg for f in __init__.cpython-311.pyc cupshelpers.cpython-311.pyc \ config.cpython-311.pyc ppds.cpython-311.pyc \ installdriver.cpython-311.pyc openprinting.cpython-311.pyc \ diff --git a/meta-openembedded/meta-networking/files/static-group-meta-networking b/meta-openembedded/meta-networking/files/static-group-meta-networking index 6896a181ea..dbdc7a5b9b 100644 --- a/meta-openembedded/meta-networking/files/static-group-meta-networking +++ b/meta-openembedded/meta-networking/files/static-group-meta-networking @@ -4,7 +4,6 @@ dovenull:x:632: postfix:x:633: postdrop:x:634: vmail:x:635: -rasvd:x:636: frr:x:637: frrvty:x:638: nogroup:x:65534: @@ -12,3 +11,5 @@ ftp:x:640: rwhod:x:641: lldpd:x:642: opensaf:x:643: +radiusd:x:651: +ntp:x:653: diff --git a/meta-openembedded/meta-networking/files/static-passwd-meta-networking b/meta-openembedded/meta-networking/files/static-passwd-meta-networking index 77c2b36f94..bca257bb27 100644 --- a/meta-openembedded/meta-networking/files/static-passwd-meta-networking +++ b/meta-openembedded/meta-networking/files/static-passwd-meta-networking @@ -3,17 +3,17 @@ 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 +radvd:x:636:nogroup::${localstatedir}/run/radvd/:/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 +radiusd:x:651:radiusd::/:/bin/nologin nm-openconnect:x:652:nogroup::/:/bin/nologin -ntp:x:653:nogroup::/:/bin/nologin +ntp:x:653:ntp::/:/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 +mosquitto:x:657:nogroup::/:/bin/nologin diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb index 1e70a3dec6..39569e9d06 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/bearssl/bearssl_0.6.bb @@ -23,7 +23,7 @@ inherit lib_package LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1fc37e1037ae673975fbcb96a98f7191" -PV .= "+git${SRCPV}" +PV .= "+git" SRCREV = "79c060eea3eea1257797f15ea1608a9a9923aa6f" SRC_URI = "git://www.bearssl.org/git/BearSSL;protocol=https;branch=master \ file://0002-test-test_x509.c-fix-potential-overflow-issue.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb index 8e164708ed..5b784d9a04 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/bluepy/bluepy_git.bb @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only & PD" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=59e0d45ea684dda215889aa1b5acd001" DEPENDS = "glib-2.0" SRCREV = "7ad565231a97c304c0eff45f2649cd005e69db09" -PV = "1.3.0+git${SRCPV}" +PV = "1.3.0+git" SRC_URI = "git://github.com/IanHarvey/bluepy.git;protocol=https;branch=master \ file://0001-bluepy-Fix-username-issue-with-tarballs.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.4.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.7.bb index 80ec8a5af5..9a6487ccd9 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.4.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.7.bb @@ -17,13 +17,13 @@ understand what the code does. It features: \ HOMEPAGE = "https://tls.mbed.org/" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +LICENSE = "Apache-2.0 | GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "aeb97a18913a86f051afab11b2c92c6be0c2eb83" +SRCREV = "555f84735aecdbd76a566cf087ec8425dfb0c8ab" SRC_URI = "git://github.com/ARMmbed/mbedtls.git;protocol=https;branch=mbedtls-2.28 \ file://run-ptest \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.5.1.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.5.2.bb index 6fc824898a..d61c54edb8 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.5.1.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.5.2.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "edb8fec9882084344a314368ac7fd957a187519c" +SRCREV = "daca7a3979c22da155ec9dce49ab1abf3b65d3a9" SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=master \ file://0001-AES-NI-use-target-attributes-for-x86-32-bit-intrinsi.patch \ file://run-ptest" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb index fdb781180a..c250ea8779 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nanomsg_1.2.1.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=587b3fd7fd291e418ff4d2b8f3904755" SECTION = "libs/networking" SRC_URI = "git://github.com/nanomsg/nanomsg.git;protocol=https;branch=master" -SRCREV = "a081f1720f576d3e72ddce14e159ba90384e5b92" +SRCREV = "fc3f684a80151a3319446fc96083a9ff384ee4fe" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch index 8122e725e7..8b286dfd14 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch @@ -36,7 +36,7 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- a/third_party/openthread/repo/third_party/mbedtls/repo/include/mbedtls/bn_mul.h +++ b/third_party/openthread/repo/third_party/mbedtls/repo/include/mbedtls/bn_mul.h -@@ -55,12 +55,28 @@ +@@ -95,12 +95,28 @@ ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 ) /* @@ -66,3 +66,14 @@ Signed-off-by: Peter Korsgaard <peter@korsgaard.com> #define MULADDC_INIT \ asm( \ +--- a/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt ++++ b/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt +@@ -210,7 +210,7 @@ if(CMAKE_COMPILER_IS_GNU) + endif(CMAKE_COMPILER_IS_GNU) + + if(CMAKE_COMPILER_IS_CLANG) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wno-error=documentation") + set(CMAKE_C_FLAGS_RELEASE "-O2") + set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") + set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage") diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch index f0bb392a9f..7c32166797 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch @@ -20,13 +20,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 59a567e729..3134740ff6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -57,6 +57,10 @@ endif() - +@@ -59,6 +59,10 @@ endif() set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_EXE_LINKER_FLAGS "-rdynamic ${CMAKE_EXE_LINKER_FLAGS}") +if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + add_compile_options(-Wno-error=nonnull-compare) @@ -35,6 +33,3 @@ index 59a567e729..3134740ff6 100644 if (OTBR_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") message(STATUS "Coverage: ON") target_compile_options(otbr-config INTERFACE -g -O0 --coverage) --- -2.36.0 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/default-cxx-std.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/default-cxx-std.patch new file mode 100644 index 0000000000..4118887cb9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/default-cxx-std.patch @@ -0,0 +1,35 @@ +Do not hardcode C std to C99 or C++ std to C++11 if not set +OE compilers are using newer than these standards and absl needs C++14 minimum + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,16 +46,6 @@ set_property(CACHE OTBR_MDNS PROPERTY ST + + include("${PROJECT_SOURCE_DIR}/etc/cmake/options.cmake") + +-if(NOT CMAKE_C_STANDARD) +- set(CMAKE_C_STANDARD 99) +- set(CMAKE_C_STANDARD_REQUIRED ON) +-endif() +- +-if(NOT CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 11) +- set(CMAKE_CXX_STANDARD_REQUIRED ON) +-endif() +- + set(CMAKE_CXX_EXTENSIONS OFF) + set(CMAKE_EXE_LINKER_FLAGS "-rdynamic ${CMAKE_EXE_LINKER_FLAGS}") + +@@ -63,6 +53,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + add_compile_options(-Wno-error=nonnull-compare) + endif() + ++if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18.1) ++ add_compile_options(-Wno-error=vla-cxx-extension) ++endif() ++ + if (OTBR_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + message(STATUS "Coverage: ON") + target_compile_options(otbr-config INTERFACE -g -O0 --coverage) diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch index 23e4368d27..0824eb6b9a 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/mbedtls.patch @@ -12,23 +12,12 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/third_party/openthread/repo/third_party/mbedtls/repo/library/bignum.c +++ b/third_party/openthread/repo/third_party/mbedtls/repo/library/bignum.c -@@ -1544,7 +1544,7 @@ __attribute__ ((noinline)) - #endif - void mpi_mul_hlp( size_t i, mbedtls_mpi_uint *s, mbedtls_mpi_uint *d, mbedtls_mpi_uint b ) +@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i, + mbedtls_mpi_uint *d, + mbedtls_mpi_uint b ) { - mbedtls_mpi_uint c = 0, t = 0; + mbedtls_mpi_uint c = 0, t __attribute__ ((unused)) = 0; #if defined(MULADDC_HUIT) for( ; i >= 8; i -= 8 ) ---- a/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt -+++ b/third_party/openthread/repo/third_party/mbedtls/repo/CMakeLists.txt -@@ -192,7 +192,7 @@ if(CMAKE_COMPILER_IS_GNU) - endif(CMAKE_COMPILER_IS_GNU) - - if(CMAKE_COMPILER_IS_CLANG) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wno-error=documentation") - set(CMAKE_C_FLAGS_RELEASE "-O2") - set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") - set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage") diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch deleted file mode 100644 index f10cec2d6c..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix/unused_var.patch +++ /dev/null @@ -1,12 +0,0 @@ -Upstream-Status: Pending - ---- a/third_party/openthread/repo/src/cli/cli.cpp -+++ b/third_party/openthread/repo/src/cli/cli.cpp -@@ -1785,6 +1785,7 @@ template <> otError Interpreter::Process - - for (uint8_t i = 0;; i++) - { -+ OT_UNUSED_VARIABLE(i); - SuccessOrExit(otThreadGetNextCacheEntry(GetInstancePtr(), &entry, &iterator)); - OutputEidCacheEntry(entry); - } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index 720228dc14..271340a25b 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -5,21 +5,21 @@ SUMMARY = "OpenThread Border Router" SECTION = "net" LICENSE = "BSD-3-Clause & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \ - file://third_party/Simple-web-server/repo/LICENSE;md5=852b3f7f320b19f6431487b8b2fb1d74 \ + file://third_party/Simple-web-server/repo/LICENSE;md5=091ac9fd29d87ad1ae5bf765d95278b0 \ file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \ file://third_party/http-parser/repo/LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778 \ file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ " -DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue" -SRCREV = "ad6822257ffddbac295db97186e4ab449a2ed32a" -PV = "0.3.0+git${SRCPV}" +DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue protobuf protobuf-native" +SRCREV = "4e937939ba6ce146fd98537cb63e0f4c41c8dbe1" +PV = "0.3.0+git" SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ file://0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch \ file://mbedtls.patch \ - file://unused_var.patch \ + file://default-cxx-std.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb index 18703d6c4d..1583a3f837 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-daemon_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ " DEPENDS = "readline" SRCREV = "7dfde1f12923f03c9680be4d838b94b7a2320324" -PV = "0.1+git${SRCPV}" +PV = "0.1+git" SRC_URI = "git://github.com/openthread/openthread.git;protocol=https;branch=main \ file://0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb index ebb3fc3c1c..b75d686e58 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/wpantund_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7820bc7f7d1638a6b54fc2e8d7fb103 \ " DEPENDS = "autoconf-archive dbus readline boost" SRCREV = "0fb1f57e4224e2df3e630e146702bfcf63fbf07a" -PV = "0.07.01+git${SRCPV}" +PV = "0.07.01+git" SRC_URI = "gitsm://github.com/openthread/wpantund.git;protocol=https;branch=master \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb index 79e1743fdf..871df69909 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/relayd/relayd_git.bb @@ -8,7 +8,7 @@ DEPENDS = "libubox" SRC_URI = "git://git.openwrt.org/project/relayd.git;branch=master" SRCREV = "f646ba40489371e69f624f2dee2fc4e19ceec00e" -PV = "0.0.1+git${SRCPV}" +PV = "0.0.1+git" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.17.bb b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb index aa29f41582..370465e141 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.17.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/lldpd/lldpd_1.0.18.bb @@ -12,7 +12,7 @@ SRC_URI = "\ file://run-ptest \ " -SRC_URI[sha256sum] = "9343177f145d2bca66ef03d59528079d3f1663c624b1e2b9d08268efdc6127ce" +SRC_URI[sha256sum] = "4b320675d608901a4a0d4feff8f96bb846d4913d914b0cf75b7d0ae80490f2f7" inherit autotools update-rc.d useradd systemd pkgconfig bash-completion github-releases ptest diff --git a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb index 36c921a167..a9b5f79424 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.19.bb @@ -62,7 +62,7 @@ do_install:append () { USERADD_PACKAGES = "${PN}" GROUPADD_PARAM:${PN} = "--system nogroup" -USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup radvd" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup --shell /sbin/nologin radvd" pkg_postinst:${PN} () { if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.6.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.7.bb index e5053f092c..519ece80f1 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.6.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.7.bb @@ -25,7 +25,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.bz2 SRC_URI:remove:toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" -SRC_URI[sha256sum] = "bc73ce506050334f51441f9054ffba4eb7cfd365a5e98a6d178b8263b9222f40" +SRC_URI[sha256sum] = "7a09a0232026824c300b72c42cc5c0c431cbb65498f41d5dea48ef447ab8037e" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ diff --git a/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb index 4858e4e579..d99d7016b2 100644 --- a/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb @@ -38,4 +38,5 @@ do_install_ptest() { RDEPENDS:${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-cryptography ${PYTHON_PN}-netclient \ ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading ${PYTHON_PN}-numbers ${PYTHON_PN}-fcntl" + ${PYTHON_PN}-threading ${PYTHON_PN}-numbers ${PYTHON_PN}-fcntl ${PYTHON_PN}-logging \ + ${PYTHON_PN}-difflib" diff --git a/meta-openembedded/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb b/meta-openembedded/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb index 19bd32ccd4..d075ec4788 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ulogd2/ulogd2_2.0.8.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" DEPENDS = "libnfnetlink" PROVIDES = "ulogd" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://git.netfilter.org/ulogd2;branch=master \ file://ulogd.init \ diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch new file mode 100644 index 0000000000..4b0227f1dc --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-SIGSEGV-during-DumpStateLog.patch @@ -0,0 +1,30 @@ +From 14cc53bb09a3d8adf301f3842c765598467e63e1 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <alex.kiernan@gmail.com> +Date: Thu, 1 Feb 2024 14:07:03 +0000 +Subject: [PATCH] Fix SIGSEGV during DumpStateLog() + +DumpStateLog() calls LogMsgWithLevelv() with category == NULL, avoid +crashing in this case. + +Upstream-Status: Inactive-Upstream [Upstream does not take patches] +Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> +--- + mDNSShared/mDNSDebug.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mDNSShared/mDNSDebug.c b/mDNSShared/mDNSDebug.c +index 7a4ca19eff6d..d449dde320f6 100644 +--- a/mDNSShared/mDNSDebug.c ++++ b/mDNSShared/mDNSDebug.c +@@ -71,7 +71,7 @@ mDNSlocal void LogMsgWithLevelv(os_log_t category, os_log_type_t level, const ch + mDNSlocal void LogMsgWithLevelv(const char *category, mDNSLogLevel_t level, const char *format, va_list args) + { + // Do not print the logs if the log category is MDNS_LOG_CATEGORY_DISABLED. +- if (strcmp(category, MDNS_LOG_CATEGORY_DISABLED) == 0) ++ if (category && strcmp(category, MDNS_LOG_CATEGORY_DISABLED) == 0) + { + return; + } +-- +2.39.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.60.25.0.4.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.80.16.bb index a009ae0c6e..c516eba6ea 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.60.25.0.4.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.80.16.bb @@ -24,8 +24,9 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https file://mdns.service \ file://0015-Add-missing-limits.h.patch \ file://0001-Handle-interface-without-ifa_addr.patch \ + file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ " -SRCREV = "8acabead9ae56551011172d6835822a89c5298d6" +SRCREV = "5fdc65a52db5c31fdf4b872d912590235b36a4dc" # 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/openflow/openflow.inc b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc index 7062d21462..7b404f5408 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc +++ b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc @@ -11,7 +11,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e870c934e2c3d6ccf085fd7cf0a1e2e2" -SRC_URI = "git://gitosis.stanford.edu/openflow.git;protocol=git;branch=master" +SRC_URI = "git://github.com/mininet/openflow;protocol=https;branch=master" CVE_STATUS[CVE-2015-1611] = "not-applicable-config: Not referred to our implementation of openflow" CVE_STATUS[CVE-2015-1612] = "not-applicable-config: Not referred to our implementation of openflow" diff --git a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch new file mode 100644 index 0000000000..27fc05f09d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow/0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch @@ -0,0 +1,30 @@ +From 12bba388719c425d9b5cd970d4fabf01edf56aa4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 7 Feb 2024 22:33:12 -0800 +Subject: [PATCH] Makefile.am: Specify export-dynamic directly to linker + +Fixes build with clang-18+ +| riscv64-yoe-linux-clang: error: unknown argument: '-export-dynamic' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 97ac1f0..e557fe7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,7 +23,7 @@ if NDEBUG + AM_CPPFLAGS += -DNDEBUG + AM_CFLAGS += -fomit-frame-pointer + else +-AM_LDFLAGS = -export-dynamic ++AM_LDFLAGS = -Wl,--export-dynamic + endif + + CLEANFILES = +-- +2.43.0 + diff --git a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb index 1ac5dd4105..c86c811cc8 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb @@ -1,10 +1,11 @@ include ${BPN}.inc -SRCREV = "c84f33f09d5dbcfc9b489f64cb30475bf36f653a" -PV = "1.0+git${SRCPV}" +SRCREV = "82ad07d997b0b2ee70e1b2c7e82fcc6d0ccf23ea" +PV = "1.0+git" SRC_URI += "file://0001-Check-and-use-strlcpy-from-libc-before-defining-own.patch \ file://0002-lib-netdev-Adjust-header-include-sequence.patch \ file://0001-generate-not-static-get_dh-functions.patch \ file://0001-socket-util-Include-sys-stat.h-for-fchmod.patch \ + file://0001-Makefile.am-Specify-export-dynamic-directly-to-linke.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb b/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb index 812f4fbcf0..71d738ddc1 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openlldp/openlldp_1.1.0.bb @@ -13,7 +13,7 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} DEPENDS = "libnl libconfig readline" SRCREV = "85e55837a81d710e5baa7da47f7ed0d205c8ede5" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://github.com/intel/openlldp.git;protocol=https;branch=branch-1.1 \ file://0001-Fix-musl-libc-build-issue.patch \ file://0001-autotools-Add-include-path-to-generated-version.h.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb index 898b69682d..949794bf30 100644 --- a/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/arptables/arptables_git.bb @@ -3,7 +3,7 @@ SECTION = "net" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCREV = "efae8949e31f8b2eb6290f377a28384cecaf105a" -PV = "0.0.5+git${SRCPV}" +PV = "0.0.5+git" SRC_URI = " \ git://git.netfilter.org/arptables;branch=master \ diff --git a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb index 62682cfce3..4842a0fbdf 100644 --- a/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/celt051/celt051_git.bb @@ -12,7 +12,7 @@ like Speex, GSM, or G.729." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=375f60ab360d17f0172737036ff155b2" -PV = "0.5.1.3+git${SRCPV}" +PV = "0.5.1.3+git" SRCREV = "5555aae843f57241d005e330b9cb65602d56db0f" diff --git a/meta-openembedded/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb b/meta-openembedded/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb new file mode 100644 index 0000000000..e3dbac4a26 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dropwatch/dropwatch_1.5.4.bb @@ -0,0 +1,18 @@ +SUMMARY = "Dropwatch is a utility to diagnose where packets are getting dropped" +DESCRIPTION = "\ +Dropwatch is a utility to help developers and system administrators to \ +diagnose problems in the Linux Networking stack, specifically their \ +ability to diagnose where packets are getting dropped." +HOMEPAGE = "https://github.com/nhorman/${BPN}" +SECTION = "net/misc" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" + +SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;nobranch=1" +SRCREV = "1e7e487a019a7c02f1f429c4d3a4647fa3787a13" + +S = "${WORKDIR}/git" + +DEPENDS = "binutils libnl libpcap readline" + +inherit pkgconfig autotools diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb index ec56eb0205..58d683eab4 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb @@ -7,6 +7,7 @@ DEPENDS += "libtdb libtalloc libtevent popt cmocka" RDEPENDS:pyldb += "python3" export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://0001-do-not-import-target-module-while-cross-compile.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb index bf7fbc8649..92da03e1a1 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.4.1.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6 " export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://0001-talloc-Add-configure-options-for-packages.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb index 248b72967d..9367600351 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.9.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://0001-tdb-Add-configure-options-for-packages.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb index 0158f8bc74..67f36083bf 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.16.0.bb @@ -7,6 +7,7 @@ DEPENDS += "libtalloc libtirpc cmocka" RDEPENDS:python3-tevent = "python3" export PYTHONHASHSEED="1" +export PYTHONARCHDIR = "${PYTHON_SITEPACKAGES_DIR}" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ file://0001-Add-configure-options-for-packages.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb index 4a9d2f54d9..3f945eeeee 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225" -PV .= "+git${SRCPV}" +PV .= "+git" LK_REL = "1.0.19" SRC_URI = " \ diff --git a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index baaff1f219..f0b7e9184e 100644 --- a/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "flex-native bison-native libnl python" -PV = "0.3.1+git${SRCPV}" +PV = "0.3.1+git" SRC_URI = "git://github.com/linux-wpan/lowpan-tools;branch=master;protocol=https \ file://no-help2man.patch \ file://0001-Fix-build-errors-with-clang.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.7.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index a5b9bd08b2..a827e7f42a 100644 --- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.remlab.net/ndisc6/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "c308ba5370d66acc44d411f12d59af61d522b91a" +SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ " diff --git a/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb index f60bb9f104..59ce3e9991 100644 --- a/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/netcf/netcf_0.2.8.bb @@ -7,7 +7,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fb919cc88dbe06ec0b0bd50e001ccf1f" SRCREV = "2c5d4255857531bc09d91dcd02e86545f29004d4" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://pagure.io/netcf.git;protocol=https;branch=master \ " diff --git a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb index 4074f0cd07..6e459eeeb4 100644 --- a/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/netperf/netperf_git.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.netperf.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=e661ab33a2a71ad6652c178dedf8aaa2" -PV = "2.7.0+git${SRCPV}" +PV = "2.7.0+git" SRC_URI = "git://github.com/HewlettPackard/netperf.git;branch=master;protocol=https \ file://cpu_set.patch \ diff --git a/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb b/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb index 9badfd75d1..955c03f42d 100644 --- a/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb +++ b/meta-openembedded/meta-networking/recipes-support/ntimed/ntimed_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://main.c;beginline=2;endline=24;md5=89db8e76f2951f3fad1 SRC_URI = "git://github.com/bsdphk/Ntimed;branch=master;protocol=https \ file://use-ldflags.patch" -PV = "0.0+git${SRCPV}" +PV = "0.0+git" SRCREV = "db0abbb4c80f2ecef6bc5d9639bca5bea28532a2" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb b/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb index c2c4335910..b918e50c68 100644 --- a/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb +++ b/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb @@ -2,7 +2,7 @@ SUMMARY = "PHY interface tool for Linux" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" -PV = "2+git${SRCPV}" +PV = "2+git" SRCREV = "8882328c08ba2efb13c049812098f1d0cb8adf0c" SRC_URI = "git://github.com/wkz/phytool.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch index 03ba872616..e181ee2872 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch @@ -1,4 +1,4 @@ -From 92747aab189aa3cee954ab31ee019205f8984155 Mon Sep 17 00:00:00 2001 +From 209f346d55eeaf74e21c541d70ec43d39b6c8c3c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 27 May 2023 17:22:10 -0700 Subject: [PATCH] cmake: Allow SYSTEMCTL_BIN to be overridden from environment @@ -8,16 +8,17 @@ for systemctl Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b7462861..c4d82fb49 100644 +index 98985e7ee..001efb800 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -226,7 +226,10 @@ else() - set(CYTHON_EXECUTABLE "") +@@ -237,7 +237,10 @@ else() + endif() endif() -find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") @@ -28,6 +29,3 @@ index 9b7462861..c4d82fb49 100644 if (NOT SYSTEMCTL_BIN) set (SYSTEMCTL_BIN "/bin/systemctl") endif() --- -2.40.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_50.0.bb index b9e07604d2..d0f4fd47a5 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_48.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_50.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 = "3e039515b959fea70356b010ed093e43cf360e99" +SRCREV = "bc6b4bc134532e952fe7f8efc251e1f89b912098" 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/tcpdump/tcpslice_1.6.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb index 7128a23cd2..93197dc3bc 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.6.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa6 SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "60d23f00d4c485fef2dda9b12c2018af958df3a511238c45374733bbc1231920" +SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903" UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.2.bb index 4a47680922..a2ab112e9d 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.2.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] = "0e428492f4c3625d61a7ccff008dc0e429d16ab8caccad4403157ea92b48a75b" +SRC_URI[sha256sum] = "9e3672be8c6caf9279a5a13582d6711ab699ae2a79323e92a99409c1ead98521" PE = "1" diff --git a/meta-openembedded/meta-oe/classes/gitpkgv.bbclass b/meta-openembedded/meta-oe/classes/gitpkgv.bbclass index cb2cea26be..5ab507969c 100644 --- a/meta-openembedded/meta-oe/classes/gitpkgv.bbclass +++ b/meta-openembedded/meta-oe/classes/gitpkgv.bbclass @@ -25,17 +25,17 @@ # # inherit gitpkgv # -# PV = "1.0+gitr${SRCPV}" # expands to something like 1.0+gitr3+4c1c21d7dbbf93b0df336994524313dfe0d4963b -# PKGV = "1.0+gitr${GITPKGV}" # expands also to something like 1.0+gitr31337+4c1c21d7d +# PV = "1.0+git" # expands to 1.0+git +# PKGV = "1.0+git${GITPKGV}" # expands also to something like 1.0+git31337+4c1c21d7d # # or # # inherit gitpkgv # -# PV = "1.0+gitr${SRCPV}" # expands to something like 1.0+gitr3+4c1c21d7dbbf93b0df336994524313dfe0d4963b -# PKGV = "${GITPKGVTAG}" # expands to something like 1.0-31337+g4c1c21d -# if there is tag v1.0 before this revision or -# ver1.0-31337+g4c1c21d if there is tag ver1.0 +# PV = "1.0+git" # expands to 1.0+git +# PKGV = "${GITPKGVTAG}" # expands to something like 1.0-31337+g4c1c21d +# if there is tag v1.0 before this revision or +# ver1.0-31337+g4c1c21d if there is tag ver1.0 GITPKGV = "${@get_git_pkgv(d, False)}" GITPKGVTAG = "${@get_git_pkgv(d, True)}" diff --git a/meta-openembedded/meta-oe/classes/signing.bbclass b/meta-openembedded/meta-oe/classes/signing.bbclass index 79944e3fe9..553d74e283 100644 --- a/meta-openembedded/meta-oe/classes/signing.bbclass +++ b/meta-openembedded/meta-oe/classes/signing.bbclass @@ -161,11 +161,11 @@ signing_import_pubkey_from_pem() { local pem="${2}" if [ -n "${IMPORT_PASS_FILE}" ]; then - openssl rsa \ + openssl pkey \ -passin "file:${IMPORT_PASS_FILE}" \ -in "${pem}" -inform pem -pubout -outform der else - openssl rsa \ + openssl pkey \ -in "${pem}" -inform pem -pubout -outform der fi | signing_pkcs11_tool --type pubkey --write-object /proc/self/fd/0 --label "${role}" @@ -189,11 +189,11 @@ signing_import_privkey_from_pem() { local pem="${2}" if [ -n "${IMPORT_PASS_FILE}" ]; then - openssl rsa \ + openssl pkey \ -passin "file:${IMPORT_PASS_FILE}" \ -in "${pem}" -inform pem -outform der else - openssl rsa \ + openssl pkey \ -in "${pem}" -inform pem -outform der fi | signing_pkcs11_tool --type privkey --write-object /proc/self/fd/0 --label "${role}" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb index bff82fe35d..90c9a7147c 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-bsp/rwmem/rwmem_1.2.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "fmt libinih" -PV .= "+git${SRCPV}" +PV .= "+git" SRCREV = "8416326777b2aada0706539b8f9f6acefa476b16" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb new file mode 100644 index 0000000000..c86750f8b6 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-generator_0.4.8.bb @@ -0,0 +1,14 @@ +require nanopb.inc + +inherit python3-dir + +DEPENDS = "protobuf-native" +RDEPENDS:${PN} += "python3-protobuf" + +EXTRA_OECMAKE += " \ + -Dnanopb_PYTHON_INSTDIR_OVERRIDE=${PYTHON_SITEPACKAGES_DIR} \ + -Dnanopb_BUILD_RUNTIME=OFF \ + -Dnanopb_BUILD_GENERATOR=ON \ + " + +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb new file mode 100644 index 0000000000..e43931a4ec --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb-runtime_0.4.8.bb @@ -0,0 +1,17 @@ +require nanopb.inc + +EXTRA_OECMAKE += " \ + -Dnanopb_PROTOC_PATH=/bin/false \ + -DBUILD_SHARED_LIBS=ON \ + -Dnanopb_BUILD_RUNTIME=ON \ + -Dnanopb_BUILD_GENERATOR=OFF \ + " + +# Maintain compatability with old header locations for packages +# which haven't yet migrated to `nanopb/pb*.h` +do_install:append() { + for hdr in ${D}${includedir}/nanopb/*; do + ln -sv nanopb/$(basename "$hdr") ${D}${includedir}/ + done +} + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.bb new file mode 100644 index 0000000000..7ad6a32782 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.bb @@ -0,0 +1,17 @@ +SUMMARY = "Combined nanopb package" +PV = "1.0" +PR = "r1" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit packagegroup + +DEPENDS = " \ + nanopb-generator \ + nanopb-runtime \ +" + +RDEPENDS:${PN} = " \ + nanopb-generator \ + nanopb-runtime \ +" diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc new file mode 100644 index 0000000000..87dbc73e63 --- /dev/null +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb.inc @@ -0,0 +1,13 @@ +DESCRIPTION="Protocol Buffers with small code size" +LICENSE="Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" + +SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https" +SRCREV = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e" + +S = "${WORKDIR}/git" + +inherit cmake + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb/0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb/0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch deleted file mode 100644 index 474f0f1584..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb/0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 30c79d1b49839a15c05a0d0ca7e54787cd7988c6 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 4 May 2023 07:17:57 +0000 -Subject: [PATCH] CMakeLists.txt: allow to set PYTHON_INSTDIR from outside - -CMakeLists.txt used: - -find_package(Python REQUIRED COMPONENTS Interpreter) -execute_process( - COMMAND ${Python_EXECUTABLE} -c - "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" - OUTPUT_VARIABLE PYTHON_INSTDIR - OUTPUT_STRIP_TRAILING_WHITESPACE -) - -but with python3native this returns: - -nanopb/0.4.7-r0/git $ ../recipe-sysroot-native/usr/bin/python3-native/python3 -c "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" -lib/python3.11/site-packages - -which doesn't respect target libdir which might be lib64 with multilib and with python3targetconfig -it also doesn't work right because of the long relative path: - -nanopb/0.4.7-r0/build $ ../recipe-sysroot-native/usr/bin/python3-native/python3 -c "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" -../../../../../../../../../../../../usr/lib64/python3.11/site-packages - -CMake Error at cmake_install.cmake:46 (file): - file cannot create directory: - /OE/lge/build/starfish/nanbield/BUILD/work/o22-starfish-linux/nanopb/0.4.7-r0/image/usr/../../../../../../../../../../../../usr/lib64/python3.11/site-packages/proto. - Maybe need administrative privileges. - -Let CMake variable to be passed from the recipe to avoid this as we're already using -${D}${PYTHON_SITEPACKAGES_DIR} in do_install:append anyway. - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Upstream-Status: Pending ---- - CMakeLists.txt | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d241c5..7d3f993 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,13 +39,15 @@ if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR) - set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/nanopb") - endif() - --find_package(Python REQUIRED COMPONENTS Interpreter) --execute_process( -- COMMAND ${Python_EXECUTABLE} -c -- "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" -- OUTPUT_VARIABLE PYTHON_INSTDIR -- OUTPUT_STRIP_TRAILING_WHITESPACE --) -+if(NOT DEFINED PYTHON_INSTDIR) -+ find_package(Python REQUIRED COMPONENTS Interpreter) -+ execute_process( -+ COMMAND ${Python_EXECUTABLE} -c -+ "import os.path, sys, sysconfig; print(os.path.relpath(sysconfig.get_path('purelib'), start=sys.prefix))" -+ OUTPUT_VARIABLE PYTHON_INSTDIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) -+endif() - - if(nanopb_BUILD_GENERATOR) - set(generator_protos nanopb) diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.7.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.7.bb deleted file mode 100644 index 9ad558146c..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.7.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="Protocol Buffers with small code size" -LICENSE="Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" - -DEPENDS = "protobuf-native" - -SRC_URI = "git://github.com/nanopb/nanopb.git;branch=master;protocol=https \ - file://0001-CMakeLists.txt-allow-to-set-PYTHON_INSTDIR-from-outs.patch \ -" -SRCREV = "b97aa657a706d3ba4a9a6ccca7043c9d6fe41cba" - -S = "${WORKDIR}/git" - -inherit cmake python3native - -EXTRA_OECMAKE += "-DPYTHON_INSTDIR=${PYTHON_SITEPACKAGES_DIR}" - -do_install:append() { - install -Dm 0755 ${S}/generator/nanopb_generator.py ${D}${bindir}/nanopb_generator.py - install -Dm 0755 ${S}/generator/protoc-gen-nanopb ${D}${bindir}/protoc-gen-nanopb - install -Dm 0755 ${S}/generator/proto/__init__.py ${D}${PYTHON_SITEPACKAGES_DIR}/proto/__init__.py -} - -FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" -FILES:${PN}-dev += "${libdir}/cmake/${BPN}" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-protobuf \ - protobuf-compiler \ -" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 4cae4947f2..c29c51a2ae 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -9,7 +9,7 @@ DEPENDS = "ncurses lirc" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ file://README.md;beginline=107;md5=5db392f043253a2d64b1737068ce6b58" -PV = "0.5.9+git${SRCPV}" +PV = "0.5.9+git" SRCREV = "0e2ce9b9c46c47363436f9ee730f7c71bf455f0f" SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch new file mode 100644 index 0000000000..af20acdcd0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-configure-lfs.patch @@ -0,0 +1,39 @@ +Upstream-Status: Submitted [https://salsa.debian.org/etbe/bonnie/-/merge_requests/3/diffs?commit_id=4ffece51791ba75ddca2e664cdce726cc40c92d3] + +diff --git i/configure.in w/configure.in +index 080e40c..f2a2bbe 100644 +--- i/configure.in ++++ w/configure.in +@@ -82,8 +82,15 @@ void * thread_func(void * param) { return NULL; } + , thread_ldflags="-lpthread" + , thread_ldflags="-pthread") + +-AC_SUBST(large_file) +-AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE ++AC_ARG_ENABLE(lfs, ++ [ --disable-lfs disable large file support], ++ LFS_CHOICE=$enableval, LFS_CHOICE=check) ++ ++if test "$LFS_CHOICE" = yes; then ++ bonniepp_cv_large_file=yes ++elif test "$LFS_CHOICE" = check; then ++ AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], bonniepp_cv_large_file, ++ AC_TRY_RUN([#ifndef _LARGEFILE64_SOURCE + #define _LARGEFILE64_SOURCE + #endif + #include <stdio.h> +@@ -118,8 +125,12 @@ int main () { + } + close(fd); + return 0; +-}], large_file="yes") +-if [[ -n "$large_file" ]]; then ++}], bonniepp_cv_large_file="yes")) ++fi ++ ++AC_SUBST(large_file) ++ ++if [[ -n "$bonniepp_cv_large_file" ]]; then + large_file="#define _LARGEFILE64_SOURCE" + fi + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch new file mode 100644 index 0000000000..4b37b8d654 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/fix-csv2html-data.patch @@ -0,0 +1,183 @@ +commit 7e9433a56f22426b11cbc9bd80e0debca67c893b +Author: Jörg Sommer <joerg.sommer@navimatix.de> +Date: Mon Jun 26 12:38:30 2023 +0200 + + csv2html: Explicitly reference data in top level + + With g++ 11 *data* became ambiguous with [std::data][1]. Therefore it's + needed to explicitly address the variable from the top level scope. + + [1] https://en.cppreference.com/w/cpp/iterator/data + +Upstream-Status: Submitted [https://salsa.debian.org/etbe/bonnie/-/merge_requests/3/diffs?commit_id=fb13a71d56dab8aaa39233fcaaedfb0ba4ad647d] + +diff --git a/bon_csv2html.cpp b/bon_csv2html.cpp +index e9d9c50..652e330 100644 +--- a/bon_csv2html.cpp ++++ b/bon_csv2html.cpp +@@ -87,8 +87,8 @@ int main(int argc, char **argv) + read_in(buf); + } + +- props = new PPCCHAR[data.size()]; +- for(i = 0; i < data.size(); i++) ++ props = new PPCCHAR[::data.size()]; ++ for(i = 0; i < ::data.size(); i++) + { + props[i] = new PCCHAR[MAX_ITEMS]; + props[i][0] = NULL; +@@ -109,7 +109,7 @@ int main(int argc, char **argv) + } + calc_vals(); + int mid_width = header(); +- for(i = 0; i < data.size(); i++) ++ for(i = 0; i < ::data.size(); i++) + { + // First print the average speed line + printf("<tr>"); +@@ -171,23 +171,23 @@ int compar(const void *a, const void *b) + + void calc_vals() + { +- ITEM *arr = new ITEM[data.size()]; ++ ITEM *arr = new ITEM[::data.size()]; + for(unsigned int column_ind = 0; column_ind < MAX_ITEMS; column_ind++) + { + switch(vals[column_ind]) + { + case eNoCols: + { +- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++) ++ for(unsigned int row_ind = 0; row_ind < ::data.size(); row_ind++) + { + if(column_ind == COL_CONCURRENCY) + { +- if(data[row_ind][column_ind] && strcmp("1", data[row_ind][column_ind])) ++ if(::data[row_ind][column_ind] && strcmp("1", ::data[row_ind][column_ind])) + col_used[column_ind] = true; + } + else + { +- if(data[row_ind][column_ind] && strlen(data[row_ind][column_ind])) ++ if(::data[row_ind][column_ind] && strlen(::data[row_ind][column_ind])) + col_used[column_ind] = true; + } + } +@@ -195,22 +195,22 @@ void calc_vals() + break; + case eCPU: + { +- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++) ++ for(unsigned int row_ind = 0; row_ind < ::data.size(); row_ind++) + { + double work, cpu; + arr[row_ind].val = 0.0; +- if(data[row_ind].size() > column_ind +- && sscanf(data[row_ind][column_ind - 1], "%lf", &work) == 1 +- && sscanf(data[row_ind][column_ind], "%lf", &cpu) == 1) ++ if(::data[row_ind].size() > column_ind ++ && sscanf(::data[row_ind][column_ind - 1], "%lf", &work) == 1 ++ && sscanf(::data[row_ind][column_ind], "%lf", &cpu) == 1) + { + arr[row_ind].val = cpu / work; + } + arr[row_ind].pos = row_ind; + } +- qsort(arr, data.size(), sizeof(ITEM), compar); ++ qsort(arr, ::data.size(), sizeof(ITEM), compar); + int col_count = -1; + double min_col = -1.0, max_col = -1.0; +- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++) ++ for(unsigned int sort_ind = 0; sort_ind < ::data.size(); sort_ind++) + { + // if item is different from previous or if the first row + // (sort_ind == 0) then increment col count +@@ -239,7 +239,7 @@ void calc_vals() + min_col /= mult; + } + double range_col = max_col - min_col; +- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++) ++ for(unsigned int sort_ind = 0; sort_ind < ::data.size(); sort_ind++) + { + if(arr[sort_ind].col_ind > -1) + { +@@ -250,7 +250,7 @@ void calc_vals() + } + else + { +- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++) ++ for(unsigned int sort_ind = 0; sort_ind < ::data.size(); sort_ind++) + { + if(vals[column_ind] == eLatency) + { +@@ -263,25 +263,25 @@ void calc_vals() + case eSpeed: + case eLatency: + { +- for(unsigned int row_ind = 0; row_ind < data.size(); row_ind++) ++ for(unsigned int row_ind = 0; row_ind < ::data.size(); row_ind++) + { + arr[row_ind].val = 0.0; +- if(data[row_ind].size() <= column_ind +- || sscanf(data[row_ind][column_ind], "%lf", &arr[row_ind].val) == 0) ++ if(::data[row_ind].size() <= column_ind ++ || sscanf(::data[row_ind][column_ind], "%lf", &arr[row_ind].val) == 0) + arr[row_ind].val = 0.0; + if(vals[column_ind] == eLatency && arr[row_ind].val != 0.0) + { +- if(strstr(data[row_ind][column_ind], "ms")) ++ if(strstr(::data[row_ind][column_ind], "ms")) + arr[row_ind].val *= 1000.0; +- else if(!strstr(data[row_ind][column_ind], "us")) ++ else if(!strstr(::data[row_ind][column_ind], "us")) + arr[row_ind].val *= 1000000.0; // is !us && !ms then secs! + } + arr[row_ind].pos = row_ind; + } +- qsort(arr, data.size(), sizeof(ITEM), compar); ++ qsort(arr, ::data.size(), sizeof(ITEM), compar); + int col_count = -1; + double min_col = -1.0, max_col = -1.0; +- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++) ++ for(unsigned int sort_ind = 0; sort_ind < ::data.size(); sort_ind++) + { + // if item is different from previous or if the first row + // (sort_ind == 0) then increment col count +@@ -310,7 +310,7 @@ void calc_vals() + min_col /= mult; + } + double range_col = max_col - min_col; +- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++) ++ for(unsigned int sort_ind = 0; sort_ind < ::data.size(); sort_ind++) + { + if(arr[sort_ind].col_ind > -1) + { +@@ -332,7 +332,7 @@ void calc_vals() + } + else + { +- for(unsigned int sort_ind = 0; sort_ind < data.size(); sort_ind++) ++ for(unsigned int sort_ind = 0; sort_ind < ::data.size(); sort_ind++) + { + if(vals[column_ind] == eLatency) + { +@@ -481,16 +481,16 @@ void read_in(CPCCHAR buf) + free((void *)arr[0]); + return; + } +- data.push_back(arr); ++ ::data.push_back(arr); + } + + void print_item(int num, int item, CPCCHAR extra) + { + PCCHAR line_data; + char buf[1024]; +- if(int(data[num].size()) > item) ++ if(int(::data[num].size()) > item) + { +- line_data = data[num][item]; ++ line_data = ::data[num][item]; + switch(item) + { + case COL_PUT_BLOCK: diff --git a/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/makefile-use-link-for-helper.patch b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/makefile-use-link-for-helper.patch new file mode 100644 index 0000000000..21565977a2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++/makefile-use-link-for-helper.patch @@ -0,0 +1,24 @@ +Upstream-Status: Submitted [https://salsa.debian.org/etbe/bonnie/-/merge_requests/3/diffs?commit_id=f6ce71d9f97316697c55d0fb3c756becdee04c5c] + +diff --git i/Makefile.in w/Makefile.in +index 6dfdb75..87a5fb1 100644 +--- i/Makefile.in ++++ w/Makefile.in +@@ -10,7 +10,7 @@ eprefix=@exec_prefix@ + WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self $(MORE_WARNINGS) + CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS) + CXX=@CXX@ $(CFLAGS) +-LINK=@CXX@ ++LINK=$(LINK.cc) + THREAD_LFLAGS=@thread_ldflags@ + + INSTALL=@INSTALL@ +@@ -43,7 +43,7 @@ getc_putc: $(GETCOBJS) getc_putc_helper + $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS) + + getc_putc_helper: $(GETCHOBJS) +- $(CXX) -o getc_putc_helper $(GETCHOBJS) ++ $(LINK) -o getc_putc_helper $(GETCHOBJS) + + bon_csv2html: bon_csv2html.o + $(LINK) bon_csv2html.o -o bon_csv2html diff --git a/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_2.00a.bb b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_2.00a.bb new file mode 100644 index 0000000000..29590bfe84 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/bonnie/bonnie++_2.00a.bb @@ -0,0 +1,33 @@ +SUMMARY = "Tests large file IO and creation/deletion of small files" +HOMEPAGE = "https://doc.coker.com.au/projects/bonnie/" +SECTION = "benchmark/tests" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://copyright.txt;md5=cd4dde95a6b9d122f0a9150ae9cc3ee0" + +SRC_URI = "\ + http://www.coker.com.au/bonnie++/${BPN}-${PV}.tgz \ + file://fix-configure-lfs.patch \ + file://fix-csv2html-data.patch \ + file://makefile-use-link-for-helper.patch \ +" +SRC_URI[sha256sum] = "a8d33bbd81bc7eb559ce5bf6e584b9b53faea39ccfb4ae92e58f27257e468f0e" + +# force lfs to skip configure's check, because we are cross-building +PACKAGECONFIG ?= "lfs" +PACKAGECONFIG[lfs] = "--enable-lfs,--disable-lfs" + +inherit autotools + +EXTRA_OECONF += "--disable-stripping" +EXTRA_OEMAKE += "-I ${S} VPATH=${S}" +CXXFLAGS += "-I ${S}" + +do_install() { + oe_runmake eprefix='${D}${exec_prefix}' install-bin +} + +PACKAGE_BEFORE_PN += "${PN}-scripts" + +FILES:${PN}-scripts = "${bindir}/bon_csv2*" + +RDEPENDS:${PN}-scripts += "perl" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb index 7969af6c37..c58524aa64 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb @@ -7,7 +7,7 @@ PROVIDES += "cpuburn-neon" SRCREV = "ad7e646700d14b81413297bda02fb7fe96613c3f" -PV = "1.0+git${SRCPV}" +PV = "1.0+git" SRC_URI = "git://github.com/ssvb/cpuburn-arm.git;branch=master;protocol=https \ file://0001-cpuburn-a8.S-Remove-.func-.endfunc.patch \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb index 17bbb9b6ce..4ace4515ad 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb @@ -7,7 +7,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a825c63897c53f487ef900598c31527" SRCREV = "b6b2ce5f9f87a09b14499cb00c600c601f022634" -PV = "20110206+git${SRCPV}" +PV = "20110206+git" SRC_URI = "git://git.musl-libc.org/libc-bench;branch=master \ file://0001-build-Do-not-override-ldflags-from-environment.patch \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb index 025aacf251..200a0de849 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/ssvb/tinymembench/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://main.c;endline=22;md5=879b9bbb60851454885b5fa47eb6b345" -PV = "0.4.9+git${SRCPV}" +PV = "0.4.9+git" SRCREV = "a2cf6d7e382e3aea1eb39173174d9fa28cad15f3" SRC_URI = "git://github.com/ssvb/tinymembench.git;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index 455859ec86..03076cbc60 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " sysfsutils" SRCREV = "1c57818ecee186aa47af0342149577df5302c022" -PV = "0.18+git${SRCPV}" +PV = "0.18+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index e8b491a435..0a041835e1 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-APACHE;md5=7b486c2338d225a1405d979ed2c15ce8 \ SRC_URI = "git://github.com/teg/firmwared.git;branch=master;protocol=https \ file://firmwared.service" -PV = "0+git${SRCPV}" +PV = "0+git" SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb index b2b5fda09e..57057c9bf5 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/i2cdev/i2cdev_git.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "\ file://lsi2c/lsi2c.c;beginline=11;endline=24;md5=72486a5e192d6ac5c7e55a4a95e380a6 \ " -PR = "git${SRCPV}" +PV = "0.7.0+git" SRC_URI = "\ git://github.com/costad2/i2cdev.git;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.7.1.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.bb index d2b2536bc3..81b30c283d 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.8.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 = "dcdad6f5d70ffb2fa151f229db048180671eb1fe" +SRCREV = "43b716b982da3df1cf8c4658f7c31b0fe28d377b" SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index aec41edf7a..f54d833a01 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=a87ee154f005 DEPENDS = "bluez5 glib-2.0" DEPENDS += "glib-2.0-native" -PV = "0.2+git${SRCPV}" +PV = "0.2+git" SRC_URI = "git://github.com/labapart/gattlib.git;branch=master;protocol=https \ file://dbus-avoid-strange-chars-from-the-build-dir.patch \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.8.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.8.3.bb index fb9c5c7b17..533b79f477 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.8.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -SRCREV = "f24f1d954cfb602c45c5b563b9fbe3418630fb59" +SRCREV = "c8e0d722794e35c71bc9bb1d79e98f926aad19e0" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.13.bb index ee310d295b..687dc41c61 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.13.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "a90e621f45b9c2f9021beea0fa6477ee0334fcd2ee34beaab42e31ea0fd3be29" +SRC_URI[sha256sum] = "5c58d0cc7c2c81540a515a7487330468c61615d23031af47be15f694fbfbc8b3" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb index b63aabdc0c..d37c547c98 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_git.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" DEPENDS = "libplist" -PV = "1.0.0+git${SRCPV}" +PV = "1.0.0+git" SRCREV = "114098d30e783fbb3def5c9b49427a86621cfcb1" SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb index 1a0590c57b..b8d7e8872b 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice/libimobiledevice_git.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" DEPENDS = "libplist usbmuxd libusbmuxd libtasn1 gnutls libgcrypt libimobiledevice-glue openssl" -PV = "1.3.0+git${SRCPV}" +PV = "1.3.0+git" SRCREV = "860ffb707af3af94467d2ece4ad258dda957c6cd" SRC_URI = "git://github.com/libimobiledevice/libimobiledevice;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch b/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch index 55595104aa..978f38d019 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs/0001-CMakeLists.txt-respect-CMAKE_INSTALL_LIBDIR-for-mult.patch @@ -29,19 +29,19 @@ Upstream-Status: Pending 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4fb0fe7..8e5a0e4 100644 +index 5be774d..6b4fd25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -6,11 +6,11 @@ project(libnfs - - set(SOVERSION 11.1.0 CACHE STRING "" FORCE) +@@ -7,11 +7,11 @@ project(libnfs + set(SOVERSION 11.2.0 CACHE STRING "" FORCE) + set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for binaries") -set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") +set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries") set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") --set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") --set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/lib/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files") +-set(INSTALL_PKGCONFIG_DIR "${INSTALL_LIB_DIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") +-set(INSTALL_CMAKE_DIR "${INSTALL_LIB_DIR}/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files") +set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") +set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/cmake/libnfs" CACHE PATH "Installation directory for cmake (.cmake) files") diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch b/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch new file mode 100644 index 0000000000..de3ab82292 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/libnfs/libnfs/0001-cmake-Test-for-sys-uio.h.patch @@ -0,0 +1,44 @@ +From d0fa719d49f38777911a8e99717f2d4b30811080 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 12 Feb 2024 19:24:54 -0800 +Subject: [PATCH] cmake: Test for sys/uio.h + +writev() API is used in few places and it will need including sys/uio.h +for getting the funciton signature + +Upstream-Status: Submitted [https://github.com/sahlberg/libnfs/pull/440] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/ConfigureChecks.cmake | 1 + + cmake/config.h.cmake | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake +index 0258fc8..c26a02d 100644 +--- a/cmake/ConfigureChecks.cmake ++++ b/cmake/ConfigureChecks.cmake +@@ -22,6 +22,7 @@ check_include_file("sys/stat.h" HAVE_SYS_STAT_H) + check_include_file("sys/sysmacros.h" HAVE_SYS_SYSMACROS_H) + check_include_file("sys/time.h" HAVE_SYS_TIME_H) + check_include_file("sys/types.h" HAVE_SYS_TYPES_H) ++check_include_file("sys/uio.h" HAVE_SYS_UIO_H) + check_include_file("sys/vfs.h" HAVE_SYS_VFS_H) + check_include_file("unistd.h" HAVE_UNISTD_H) + check_include_file("utime.h" HAVE_UTIME_H) +diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake +index 4016c6c..6263896 100644 +--- a/cmake/config.h.cmake ++++ b/cmake/config.h.cmake +@@ -90,6 +90,9 @@ + /* Define to 1 if you have the <sys/types.h> header file. */ + #cmakedefine HAVE_SYS_TYPES_H + ++/* Define to 1 if you have the <sys/uio.h> header file. */ ++#cmakedefine HAVE_SYS_UIO_H ++ + /* Define to 1 if you have the <sys/vfs.h> header file. */ + #cmakedefine HAVE_SYS_VFS_H + +-- +2.43.1 + 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.3.bb index afec2753cb..a6eabc6095 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.3.bb @@ -6,8 +6,9 @@ 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 \ + file://0001-cmake-Test-for-sys-uio.h.patch \ " -SRCREV = "40348f45d6beb8a8f50b6b63414a98fc1a061b7d" +SRCREV = "4379837536d9eac537810dc7b13071136049b22a" S = "${WORKDIR}/git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.35.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.35.2-dev.bb index 87d3546023..5587333ef8 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.35.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.35.2-dev.bb @@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 glib-2.0-native" inherit meson pkgconfig bash-completion gobject-introspection -SRCREV = "7bb160c70ecd4d8f47ae5c228a85c6a6cf4e4bdd" +SRCREV = "72d92e75a430900c00aeb1a471965d53eb307708" SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=main" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb index 7bac3117cd..3549cac568 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libqrtr-glib/libqrtr-glib_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951 SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib.git;protocol=https;branch=qrtr-1-2" -PV = "1.2.2+git${SRCPV}" +PV = "1.2.2+git" SRCREV = "8991f0e93713ebf4da48ae4f23940ead42f64c8c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb index d5411b19b2..d9cca404d7 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb @@ -8,7 +8,7 @@ DEPENDS = "autoconf-archive libsigc++-2.0 curl cppunit libtool libtorrent ncurse SRC_URI = "git://github.com/rakshasa/rtorrent;branch=master;protocol=https" SRCREV = "d067bd802e44f0e6a747aabcc311ada2175fd550" -PV = "0.9.8+git${SRCPV}" +PV = "0.9.8+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.1.bb index 2156889eb1..108647bdd6 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ser2net/ser2net_4.6.1.bb @@ -9,7 +9,7 @@ DEPENDS = "gensio libyaml" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ser2net/ser2net/ser2net-${PV}.tar.gz" -SRC_URI[sha256sum] = "58a7ba97761f96b9228bccf6367c2715c0c0be1f99e0a114d429d8c1fcb9c8b2" +SRC_URI[sha256sum] = "78ffee19d9b97e93ae65b5cec072da2b7b947fc484e9ccb3f535702f36f6ed19" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/ser2net/files/ser2net" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb index 1492234495..569d6a41cf 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/usbmuxd/usbmuxd_git.bb @@ -9,7 +9,7 @@ DEPENDS = "udev libusb1 libplist libimobiledevice-glue" inherit autotools pkgconfig gitpkgv systemd PKGV = "${GITPKGVTAG}" -PV = "1.1.2+git${SRCPV}" +PV = "1.1.2+git" SRCREV = "01c94c77f59404924f1c46d99c4e5e0c7817281b" SRC_URI = "git://github.com/libimobiledevice/usbmuxd;protocol=https;branch=master" 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 ce9d758d9f..5ae72df862 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 @@ -15,9 +15,13 @@ inherit cmake pkgconfig PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" +EXTRA_OECMAKE = " \ + -DCMAKECONFIG_INSTALL_DIR:PATH=${@os.path.relpath(d.getVar('libdir'), d.getVar('prefix') + '/') + "/cmake/"} \ +" + FILES:${PN} = "${bindir}/*" FILES:lib${BPN} = "${libdir}/*.so.*" -FILES:lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake" +FILES:lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${libdir}/cmake" FILES:lib${BPN}-staticdev = "${libdir}/lib*.a" RDEPENDS:lib${BPN}-dev = "zeromq-dev" @@ -33,4 +37,5 @@ PACKAGECONFIG[uuid] = "-DCZMQ_WITH_UUID=ON,-DCZMQ_WITH_UUID=OFF,util-linux" do_install:append() { mkdir -p ${D}/${includedir}/${BPN} mv ${D}/${includedir}/sha1.h ${D}/${includedir}/${BPN}/. + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/czmqTargets.cmake } diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb index d096cd618e..424d31a535 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://dbus-daemon-proxy.c;endline=19;md5=41df6d21fe1c97d6a1cc22a5bf374cba" DEPENDS = "dbus dbus-glib" SRCREV = "1226a0a1374628ff191f6d8a56000be5e53e7608" -PV = "0.0.0+gitr${SRCPV}" +PV = "0.0.0+git" PR = "r1.59" SRC_URI = "git://github.com/alban/dbus-daemon-proxy;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.8.bb b/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.8.bb index ad7a3a7ed4..684355ef3e 100644 --- a/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.8.bb +++ b/meta-openembedded/meta-oe/recipes-core/glfw/glfw_3.3.8.bb @@ -10,7 +10,7 @@ SECTION = "lib" inherit pkgconfig cmake features_check -PV .= "+git${SRCPV}" +PV .= "+git" SRCREV = "7482de6071d21db77a7236155da44c172a7f6c9e" SRC_URI = "git://github.com/glfw/glfw.git;branch=3.3-stable;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb index 9733749628..a97a2841f7 100644 --- a/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/libnfc/libnfc_git.bb @@ -7,7 +7,7 @@ SECTION = "libs" inherit autotools pkgconfig -PV = "1.8.0+git${SRCPV}" +PV = "1.8.0+git" S = "${WORKDIR}/git" SRCREV = "f02ff51449240102c27a97173dc495e8e7789046" diff --git a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb index c6db78b4ab..a7ac358f27 100644 --- a/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/mdbus2/mdbus2_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" DEPENDS = "readline" -PV = "2.3.3+git${SRCPV}" +PV = "2.3.3+git" SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=https;branch=master \ file://0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch \ diff --git a/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb b/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb index 163a74ebe3..0bb45b8eaf 100644 --- a/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=81a81bf31abecc50c20862fc8a716329" SRC_URI = "gitsm://github.com/pullmoll/musl-rpmatch.git;protocol=https;branch=master" -PV = "1.0+git${SRCPV}" +PV = "1.0+git" SRCREV = "46267b154987d3e1f25d3a75423faa62bb5ee342" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch deleted file mode 100644 index 486d6c07be..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b06d16ec2d4aefc4cf1675e9dd6314956bc32d69 Mon Sep 17 00:00:00 2001 -From: Naveen Saini <naveen.kumar.saini@intel.com> -Date: Thu, 7 Apr 2022 14:36:58 +0800 -Subject: [PATCH] build: set HAVE_STATEMENT_EXPR var - -The v73 version tries to build and run a test program at compile -time to check whether compiler supports sizeof and expression statements -and sets HAVE_STATEMENT_EXPR accordingly. This requires EXEWRAPPER_ENABLED -in meson.bbclass to be True and qemu-usermode to be working. - -In cases when EXEWRAPPER_ENABLED is False, build fails with error: - -| ../git/meson.build:213:0: ERROR: Can not run test applications in -this cross environment. - -We don't really need to do this as these have been supported since gcc3 and can set the configs to 1. - -The autotools implementation also used to set it to 1 so this doesn't change anything: - -https://github.com/pmem/ndctl/blob/v72.1/configure.ac#L70 - -Upstream-Status: Inappropriate - -Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> ---- - meson.build | 18 ++---------------- - 1 file changed, 2 insertions(+), 16 deletions(-) - -diff --git a/meson.build b/meson.build -index 42e11aa..e8d218b 100644 ---- a/meson.build -+++ b/meson.build -@@ -210,22 +210,8 @@ conf.set('ENABLE_DESTRUCTIVE', get_option('destructive').enabled()) - conf.set('ENABLE_LOGGING', get_option('logging').enabled()) - conf.set('ENABLE_DEBUG', get_option('dbg').enabled()) - --typeof = cc.run(''' -- int main() { -- struct { -- char a[16]; -- } x; -- typeof(x) y; -- -- return sizeof(x) == sizeof(y); -- } -- ''' --) -- --if typeof.compiled() and typeof.returncode() == 1 -- conf.set('HAVE_TYPEOF', 1) -- conf.set('HAVE_STATEMENT_EXPR', 1) --endif -+conf.set('HAVE_TYPEOF', 1) -+conf.set('HAVE_STATEMENT_EXPR', 1) - - if target_machine.endian() == 'big' - conf.set('HAVE_BIG_ENDIAN', 1) --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch deleted file mode 100644 index ee172c3a69..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-meson-Use-pkg-config-to-detect-iniparser.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 44516eee75696c84849c0f7aa632e2456b101813 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Mar 2022 00:57:03 -0700 -Subject: [PATCH] meson: Use pkg-config to detect iniparser - -Add iniparser dependency to util subdir - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - meson.build | 2 +- - util/meson.build | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 42e11aa..4209320 100644 ---- a/meson.build -+++ b/meson.build -@@ -160,7 +160,7 @@ cc = meson.get_compiler('c') - - # keyutils and iniparser lack pkgconfig - keyutils = cc.find_library('keyutils', required : get_option('keyutils')) --iniparser = cc.find_library('iniparser', required : true) -+iniparser = dependency('iniparser', required : true) - - conf = configuration_data() - check_headers = [ -diff --git a/util/meson.build b/util/meson.build -index 784b279..8e9ae9a 100644 ---- a/util/meson.build -+++ b/util/meson.build -@@ -12,5 +12,6 @@ util = static_library('util', [ - 'iomem.c', - ], - include_directories : root_inc, -+ dependencies : iniparser, - ) - util_dep = declare_dependency(link_with : util) --- -2.35.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch deleted file mode 100644 index fe2612ce94..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-util-Correct-path-to-iniparser.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c212d228c25cb583f52a6d31e9f0ec7bc1f9c506 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Mar 2022 01:10:02 -0700 -Subject: [PATCH] util: Correct path to iniparser.h - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - util/parse-configs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/parse-configs.c b/util/parse-configs.c -index c834a07..1b7ffa6 100644 ---- a/util/parse-configs.c -+++ b/util/parse-configs.c -@@ -4,7 +4,7 @@ - #include <dirent.h> - #include <errno.h> - #include <fcntl.h> --#include <iniparser.h> -+#include <iniparser/iniparser.h> - #include <sys/stat.h> - #include <util/parse-configs.h> - #include <util/strbuf.h> --- -2.35.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v78.bb index da649d578b..2974a7db7f 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v78.bb @@ -10,19 +10,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74a614eac8b2657a4b8e6607421a0883" inherit meson pkgconfig bash-completion systemd -SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5" -SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \ - file://0001-util-Correct-path-to-iniparser.h.patch \ - file://0001-meson-Use-pkg-config-to-detect-iniparser.patch \ - file://0001-build-set-HAVE_STATEMENT_EXPR-var.patch" +SRCREV = "a871e6153b11fe63780b37cdcb1eb347b296095c" +SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)" -DEPENDS = "kmod udev json-c keyutils iniparser" +DEPENDS = "kmod udev json-c keyutils iniparser libtraceevent libtracefs" S = "${WORKDIR}/git" -EXTRA_OECONF += "-Ddestructive=enabled" +EXTRA_OEMESON += "-Ddestructive=enabled -Diniparserdir=${STAGING_INCDIR}/iniparser" PACKAGECONFIG ??= "tests ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" @@ -33,4 +30,4 @@ SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','', SYSTEMD_SERVICE:${PN} = "ndctl-monitor.service daxdev-reconfigure@.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" -FILES:${PN} += "${datadir}/daxctl/daxctl.conf " +FILES:${PN} += "${datadir}/daxctl/daxctl.conf ${nonarch_libdir}/systemd/system" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index 8a712602cc..7ae0362d37 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -6,7 +6,7 @@ SRC_URI = "git://github.com/KhronosGroup/OpenCL-CLHPP.git;protocol=https;branch= LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -PV = "2.0.16+git${SRCPV}" +PV = "2.0.16+git" SRCREV = "1df82b9749739f2681081092ae163bb0f0d40f66" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 1a588eb29c..740835b217 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -326,7 +326,7 @@ RDEPENDS:packagegroup-meta-oe-devtools:remove:mips64el = "luajit nodejs" RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc = "android-tools breakpad lshw luajit uftrace" RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64 = "android-tools breakpad lshw luajit ply uftrace" RDEPENDS:packagegroup-meta-oe-devtools:remove:powerpc64le = "android-tools breakpad lshw luajit ply uftrace" -RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" +RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv64 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply" RDEPENDS:packagegroup-meta-oe-devtools:remove:riscv32 = "breakpad concurrencykit heaptrack lshw ltrace luajit nodejs ply uftrace" RDEPENDS:packagegroup-meta-oe-devtools:remove:libc-musl:riscv32 = "php" RDEPENDS:packagegroup-meta-oe-devtools:remove:aarch64 = "concurrencykit" diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch deleted file mode 100644 index e04917e305..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Fix-daemon-install-ignoring-configured-runstatedir.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4c90a66fb7fd9dbb861c5a888fc828f3795fe540 Mon Sep 17 00:00:00 2001 -From: Ben Brown <ben@demerara.io> -Date: Tue, 19 Jul 2022 16:12:12 +0100 -Subject: [PATCH] Fix daemon install ignoring configured runstatedir - -Upstream-Status: Backport - -Signed-off-by: Ben Brown <ben@demerara.io> -Signed-off-by: Ming Liu <liu.ming50@gmail.com> - ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index ad3655d..abd7a4c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -37,7 +37,7 @@ escrow_PROGRAMS = plymouthd-fd-escrow - - plymouthd_fd_escrow_SOURCES = plymouthd-fd-escrow.c - --plymouthdrundir = $(localstatedir)/run/plymouth -+plymouthdrundir = $(plymouthruntimedir) - plymouthdspooldir = $(localstatedir)/spool/plymouth - plymouthdtimedir = $(localstatedir)/lib/plymouth - --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch deleted file mode 100644 index 6a86c76d13..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 746c690f57b52e6fe21cc2a11b5bb71d25af3128 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Wed, 13 Dec 2017 16:15:57 +0100 -Subject: [PATCH] Make full path to systemd-tty-ask-password-agent configurable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index aad673e..6b37179 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -48,7 +48,10 @@ PLYMOUTH_LIBS="-lm -lrt -ldl" - AC_SUBST(PLYMOUTH_CFLAGS) - AC_SUBST(PLYMOUTH_LIBS) - --AC_PATH_PROG([SYSTEMD_ASK_PASSWORD_AGENT], [systemd-tty-ask-password-agent]) -+AC_ARG_WITH(systemd-tty-ask-password-agent, AS_HELP_STRING([--with-systemd-tty-ask-password-agent],[path of systemd-tty-ask-password-agent]),SYSTEMD_ASK_PASSWORD_AGENT=${withval},SYSTEMD_ASK_PASSWORD_AGENT=/bin/systemd-tty-ask-password-agent) -+AC_SUBST(SYSTEMD_ASK_PASSWORD_AGENT) -+ -+# checked: UDEVADM is not used - AC_PATH_PROG([UDEVADM], [udevadm]) - - AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango],[enable building with pango, disabled there is no encryption prompts]),enable_pango=$enableval,enable_pango=yes) --- -2.9.5 - diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch deleted file mode 100644 index e351098f35..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-Use-standard-runstatedir-vs-custom-flag.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 97012d2c38b84fffb32867fb5eeac64a93455626 Mon Sep 17 00:00:00 2001 -From: Ben Brown <ben@demerara.io> -Date: Tue, 19 Jul 2022 16:10:24 +0100 -Subject: [PATCH] Use standard runstatedir vs custom flag - -Upstream-Status: Backport - ---- - configure.ac | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -Signed-off-by: Ben Brown <ben@demerara.io> -Signed-off-by: Ming Liu <liu.ming50@gmail.com> - -diff --git a/configure.ac b/configure.ac -index 608ad02..34a2f2c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -140,9 +140,7 @@ if test x$enable_systemd_integration = xyes; then - AC_SUBST(SYSTEMD_UNIT_DIR) - fi - --AC_ARG_WITH([runtimedir], -- AC_HELP_STRING([--with-runtimedir=DIR], [runtime data dir [LOCALSTATEDIR/run]]), -- [plymouthruntimedir=${withval}/plymouth], [plymouthruntimedir=""]) -+AC_ARG_WITH([runtimedir], [], [AC_MSG_ERROR([--with-runtimedir is obsolete, use --runstatedir instead])], []) - - AC_ARG_WITH(system-root-install, AS_HELP_STRING([--with-system-root-install],[Install client in /bin and daemon in /sbin]),with_system_root_install=${withval},with_system_root_install=no) - AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = yes]) -@@ -150,16 +148,11 @@ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = ye - if test x$with_system_root_install = xyes; then - plymouthclientdir=/bin - plymouthdaemondir=/sbin -- if (test -z "${plymouthruntimedir}"); then -- plymouthruntimedir=/run/plymouth -- fi - else - plymouthclientdir=$bindir - plymouthdaemondir=$sbindir -- if (test -z "${plymouthruntimedir}"); then -- plymouthruntimedir=$localstatedir/run/plymouth -- fi - fi -+plymouthruntimedir=$runstatedir/plymouth - AC_SUBST(plymouthclientdir) - AC_SUBST(plymouthdaemondir) - AC_SUBST(plymouthruntimedir) --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Avoid-linking-to-plymouth_logo_file.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Avoid-linking-to-plymouth_logo_file.patch new file mode 100644 index 0000000000..77c9fbd964 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Avoid-linking-to-plymouth_logo_file.patch @@ -0,0 +1,28 @@ +From 210090a8bddc4d4fae6089449306276a58db7409 Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Wed, 14 Feb 2024 14:45:29 +0100 +Subject: [PATCH] Avoid linking to plymouth_logo_file + +Otherwise it would lead to install errors during cross-compilation. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + themes/spinfinity/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/themes/spinfinity/meson.build b/themes/spinfinity/meson.build +index f48e8e55..da9ea705 100644 +--- a/themes/spinfinity/meson.build ++++ b/themes/spinfinity/meson.build +@@ -56,5 +56,5 @@ install_data( + + install_symlink('header-image.png', + install_dir: plymouth_theme_path / 'spinfinity', +- pointing_to: plymouth_logo_file, ++ pointing_to: '..' / '..'/ 'bizcom.png', + ) +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Drop-libdl-references.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Drop-libdl-references.patch new file mode 100644 index 0000000000..e922f5ce95 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Drop-libdl-references.patch @@ -0,0 +1,70 @@ +From c1d5f8265a1974908ae8dd32714d305035939cc7 Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Wed, 14 Feb 2024 12:24:44 +0100 +Subject: [PATCH] Drop libdl references + +dl has been integrated into libc since glibc 2.34, dont need to link to +it any more. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + meson.build | 2 -- + src/client/meson.build | 1 - + src/libply-splash-core/meson.build | 1 - + src/libply/meson.build | 1 - + 4 files changed, 5 deletions(-) + +diff --git a/meson.build b/meson.build +index c6996aed..91688f73 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,8 +24,6 @@ cc = meson.get_compiler('c') + lm_dep = cc.find_library('m') + lrt_dep = cc.find_library('rt') + +-ldl_dep = dependency('dl') +- + libpng_dep = dependency('libpng', version: '>= 1.2.16') + + libudev_dep = dependency('libudev', required: get_option('udev')) +diff --git a/src/client/meson.build b/src/client/meson.build +index 0506c8b4..272a811c 100644 +--- a/src/client/meson.build ++++ b/src/client/meson.build +@@ -52,7 +52,6 @@ pkgconfig.generate(libply_boot_client, + description: 'Client Library for Boot Splash', + libraries: [ + libply, +- ldl_dep, + ], + subdirs: [ + 'plymouth-1/ply', +diff --git a/src/libply-splash-core/meson.build b/src/libply-splash-core/meson.build +index cd22345c..c0f62b4b 100644 +--- a/src/libply-splash-core/meson.build ++++ b/src/libply-splash-core/meson.build +@@ -81,7 +81,6 @@ pkgconfig.generate(libply_splash_core, + description: 'Utility Library for Boot Splash Plugins', + libraries: [ + libply, +- ldl_dep, + ], + subdirs: [ + 'plymouth-1/ply', +diff --git a/src/libply/meson.build b/src/libply/meson.build +index 70f72488..77dced75 100644 +--- a/src/libply/meson.build ++++ b/src/libply/meson.build +@@ -17,7 +17,6 @@ libply_sources = files( + ) + + libply_deps = [ +- ldl_dep, + lm_dep, + ] + +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch new file mode 100644 index 0000000000..a25aa3b16c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch @@ -0,0 +1,63 @@ +From beb9b218f94872e70d02578d4ff016e08abc4717 Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Wed, 14 Feb 2024 12:03:26 +0100 +Subject: [PATCH] Make full path to systemd-tty-ask-password-agent configurable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + meson.build | 2 +- + meson_options.txt | 5 +++++ + systemd-units/meson.build | 2 +- + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 26789060..c6996aed 100644 +--- a/meson.build ++++ b/meson.build +@@ -44,7 +44,7 @@ if get_option('systemd-integration') + systemd_unit_dir = systemd_dep.get_variable('systemdsystemunitdir', + pkgconfig_define: [ 'rootprefix', get_option('prefix') ], + ) +- systemd_ask_password_agent = find_program('systemd-tty-ask-password-agent') ++ systemd_ask_password_agent = get_option('systemd-tty-ask-password-agent') + endif + + if get_option('upstart-monitoring') +diff --git a/meson_options.txt b/meson_options.txt +index 4f601bb0..aac661fc 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -53,6 +53,11 @@ option('systemd-integration', + value: true, + description: 'Coordinate boot up with systemd', + ) ++option('systemd-tty-ask-password-agent', ++ type: 'string', ++ value: '/bin/systemd-tty-ask-password-agent', ++ description: 'Path of systemd-tty-ask-password-agent', ++) + option('udev', + type: 'feature', + value: 'auto', +diff --git a/systemd-units/meson.build b/systemd-units/meson.build +index 06379312..7adc86ae 100644 +--- a/systemd-units/meson.build ++++ b/systemd-units/meson.build +@@ -21,7 +21,7 @@ foreach unit_templ : systemd_unit_templates + 'PLYMOUTH_CLIENT_DIR': get_option('prefix') / get_option('bindir'), + 'PLYMOUTH_DAEMON_DIR': get_option('prefix') / get_option('sbindir'), + 'plymouthruntimedir': plymouth_runtime_dir, +- 'SYSTEMD_ASK_PASSWORD_AGENT': systemd_ask_password_agent.full_path(), ++ 'SYSTEMD_ASK_PASSWORD_AGENT': systemd_ask_password_agent, + }, + install: true, + install_dir: systemd_unit_dir, +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Make-themes-build-optional.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Make-themes-build-optional.patch new file mode 100644 index 0000000000..ab9aa7c39e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-Make-themes-build-optional.patch @@ -0,0 +1,120 @@ +From 2caf68370791c7aa48f94628c7f7a012753388c5 Mon Sep 17 00:00:00 2001 +From: Ming Liu <liu.ming50@gmail.com> +Date: Wed, 14 Feb 2024 15:07:00 +0100 +Subject: [PATCH] Make themes build optional + +The users can choose which themes should be built. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Ming Liu <liu.ming50@gmail.com> +--- + meson_options.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++ + themes/meson.build | 38 ++++++++++++++++++++++++++--------- + 2 files changed, 79 insertions(+), 9 deletions(-) + +diff --git a/meson_options.txt b/meson_options.txt +index 4f601bb0..1cbf6d2b 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -83,3 +83,53 @@ option('docs', + value: true, + description: 'Build documentation', + ) ++option('spinfinity-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with spinfinity theme', ++) ++option('fade-in-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with fade-in theme', ++) ++option('text-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with text theme', ++) ++option('details-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with details theme', ++) ++option('solar-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with solar theme', ++) ++option('glow-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with glow theme', ++) ++option('script-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with script theme', ++) ++option('spinner-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with spinner theme', ++) ++option('tribar-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with tribar theme', ++) ++option('bgrt-theme', ++ type: 'boolean', ++ value: true, ++ description: 'Build with bgrt theme', ++) +diff --git a/themes/meson.build b/themes/meson.build +index dc2ca6e2..15918472 100644 +--- a/themes/meson.build ++++ b/themes/meson.build +@@ -1,10 +1,30 @@ +-subdir('spinfinity') +-subdir('fade-in') ++if get_option('spinfinity-theme') ++ subdir('spinfinity') ++endif ++if get_option('fade-in-theme') ++ subdir('fade-in') ++endif ++if get_option('text-theme') + subdir('text') +-subdir('details') +-subdir('solar') +-subdir('glow') +-subdir('script') +-subdir('spinner') +-subdir('tribar') +-subdir('bgrt') ++endif ++if get_option('details-theme') ++ subdir('details') ++endif ++if get_option('solar-theme') ++ subdir('solar') ++endif ++if get_option('glow-theme') ++ subdir('glow') ++endif ++if get_option('script-theme') ++ subdir('script') ++endif ++if get_option('spinner-theme') ++ subdir('spinner') ++endif ++if get_option('tribar-theme') ++ subdir('tribar') ++endif ++if get_option('bgrt-theme') ++ subdir('bgrt') ++endif +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch index 58838500bf..58838500bf 100644 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-Add-the-retain-splash-option.patch +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch index 7ba1034e93..7ba1034e93 100644 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/files/0001-plymouth-start-service-in-add-related-kernel-paramet.patch +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb deleted file mode 100644 index 469914cd47..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_22.02.122.bb +++ /dev/null @@ -1,73 +0,0 @@ -SUMMARY = "Plymouth is a project from Fedora providing a flicker-free graphical boot process." -DESCRIPTION = "Plymouth is an application that runs very early in the boot process \ -(even before the root filesystem is mounted!) that provides a \ -graphical boot animation while the boot process happens in the background." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth" -SECTION = "base" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = " \ - http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ - file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ - file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \ - file://0001-plymouth-Add-the-retain-splash-option.patch \ - file://0001-Use-standard-runstatedir-vs-custom-flag.patch \ - file://0001-Fix-daemon-install-ignoring-configured-runstatedir.patch \ -" - -SRC_URI[sha256sum] = "100551442221033ce868c447ad6c74d831d209c18ae232b98ae0207e34eadaeb" - -LOGO ??= "${datadir}/plymouth/bizcom.png" -RUNSTATEDIR ??= "${localstatedir}/run" - -EXTRA_OECONF = "--runstatedir=${RUNSTATEDIR}" - -PACKAGECONFIG ??= "initrd logo pango udev ${@bb.utils.filter('DISTRO_FEATURES', 'systemd usrmerge', d)}" -PACKAGECONFIG:append:x86 = " drm" -PACKAGECONFIG:append:x86-64 = " drm" - -PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" -PACKAGECONFIG[documentation] = "--enable-documentation,--disable-documentation" -PACKAGECONFIG[initrd] = ",," -PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" -PACKAGECONFIG[logo] = "--with-logo=${LOGO},--without-logo" -PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" -PACKAGECONFIG[systemd] = "--enable-systemd-integration --with-systemd-tty-ask-password-agent=${base_bindir}/systemd-tty-ask-password-agent,--disable-systemd-integration,systemd" -PACKAGECONFIG[udev] = "--with-udev,--without-udev,udev" -PACKAGECONFIG[upstart-monitoring] = "--enable-upstart-monitoring,--disable-upstart-monitoring,ncurses dbus" -PACKAGECONFIG[usrmerge] = "--without-system-root-install,--with-system-root-install" - -inherit autotools pkgconfig systemd gettext - -do_install:append() { - # Remove /var/run from package as plymouth will populate it on startup - rm -fr ${D}${RUNSTATEDIR} - - if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then - rm -rf "${D}${libexecdir}" - fi -} - -PROVIDES = "virtual/psplash" -RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support" - -PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" -PACKAGES =+ "${PN}-set-default-theme" - -FILES:${PN}-initrd = "${libexecdir}/plymouth/*" -FILES:${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme" - -FILES:${PN} += "${systemd_unitdir}/system/*" -FILES:${PN}-dbg += "${libdir}/plymouth/renderers/.debug" - -DEPENDS = "libcap libpng" -DEPENDS:append:libc-musl = " musl-rpmatch" - -LDFLAGS:append:libc-musl = " -lrpmatch" - -RDEPENDS:${PN}-initrd = "bash dracut" -RDEPENDS:${PN}-set-default-theme = "bash" - -SYSTEMD_SERVICE:${PN} = "plymouth-start.service" diff --git a/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb new file mode 100644 index 0000000000..cdf24477a7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb @@ -0,0 +1,102 @@ +SUMMARY = "Plymouth is a project from Fedora providing a flicker-free graphical boot process." +DESCRIPTION = "Plymouth is an application that runs very early in the boot process \ +(even before the root filesystem is mounted!) that provides a \ +graphical boot animation while the boot process happens in the background." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth" +SECTION = "base" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = " \ + http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ + file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ + file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \ + file://0001-plymouth-Add-the-retain-splash-option.patch \ + file://0001-Drop-libdl-references.patch \ + file://0001-Avoid-linking-to-plymouth_logo_file.patch \ + file://0001-Make-themes-build-optional.patch \ +" + +SRC_URI[sha256sum] = "f3f7841358c98f5e7b06a9eedbdd5e6882fd9f38bbd14a767fb083e3b55b1c34" + +PLYMOUTH_RUNSTATEDIR ??= "${base_prefix}/run" +PLYMOUTH_RELEASE_FILE ??= "${sysconfdir}/system-release" + +PLYMOUTH_BACKGROUND_COLOR ??= "0x5d5950" +PLYMOUTH_BACKGROUND_START_COLOR_STOP ??= "0x807c71" +PLYMOUTH_BACKGROUND_END_COLOR_STOP ??= "0x3a362f" + +PLYMOUTH_BOOT_TTY ??= "/dev/tty1" +PLYMOUTH_SHUTDOWN_TTY ??= "/dev/tty63" + +PLYMOUTH_THEMES ??= "spinfinity fade-in text details solar glow script spinner tribar bgrt" + +EXTRA_OEMESON += " \ + -Drunstatedir=${PLYMOUTH_RUNSTATEDIR} \ + -Drelease-file=${PLYMOUTH_RELEASE_FILE} \ + -Dbackground-color=${PLYMOUTH_BACKGROUND_COLOR} \ + -Dbackground-start-color-stop=${PLYMOUTH_BACKGROUND_START_COLOR_STOP} \ + -Dbackground-end-color-stop=${PLYMOUTH_BACKGROUND_END_COLOR_STOP} \ + -Dboot-tty=${PLYMOUTH_BOOT_TTY} \ + -Dshutdown-tty=${PLYMOUTH_SHUTDOWN_TTY} \ +" + +PACKAGECONFIG ??= "initrd freetype pango udev ${PLYMOUTH_THEMES} ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG:append:x86 = " drm" +PACKAGECONFIG:append:x86-64 = " drm" + +PACKAGECONFIG[drm] = "-Ddrm=true,-Ddrm=false,libdrm" +PACKAGECONFIG[docs] = "-Ddocs=true,-Ddocs=false" +PACKAGECONFIG[freetype] = "-Dfreetype=enabled,-Dfreetype=disabled,freetype" +PACKAGECONFIG[initrd] = ",," +PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" +PACKAGECONFIG[pango] = "-Dpango=enabled,-Dpango=disabled,pango cairo" +PACKAGECONFIG[systemd] = "-Dsystemd-integration=true ,-Dsystemd-integration=false,systemd" +PACKAGECONFIG[tracing] = "-Dtracing=true,-Dtracing=false" +PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev" +PACKAGECONFIG[upstart-monitoring] = "-Dupstart-monitoring=true,-Dupstart-monitoring=false,ncurses dbus" + +# theme configs +PACKAGECONFIG[spinfinity] = "-Dspinfinity-theme=true,-Dspinfinity-theme=false" +PACKAGECONFIG[fade-in] = "-Dfade-in-theme=true,-Dfade-in-theme=false" +PACKAGECONFIG[text] = "-Dtext-theme=true,-Dtext-theme=false" +PACKAGECONFIG[details] = "-Ddetails-theme=true,-Ddetails-theme=false" +PACKAGECONFIG[solar] = "-Dsolar-theme=true,-Dsolar-theme=false" +PACKAGECONFIG[glow] = "-Dglow-theme=true,-Dglow-theme=false" +PACKAGECONFIG[script] = "-Dscript-theme=true,-Dscript-theme=false" +PACKAGECONFIG[spinner] = "-Dspinner-theme=true,-Dspinner-theme=false" +PACKAGECONFIG[tribar] = "-Dtribar-theme=true,-Dtribar-theme=false" +PACKAGECONFIG[bgrt] = "-Dbgrt-theme=true,-Dbgrt-theme=false" + +inherit meson pkgconfig systemd gettext + +do_install:append() { + # Remove ${PLYMOUTH_RUNSTATEDIR} from package as plymouth will populate it on startup + rm -fr ${D}${PLYMOUTH_RUNSTATEDIR} + + if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then + rm -rf "${D}${libexecdir}" + fi +} + +PROVIDES = "virtual/psplash" +RPROVIDES:${PN} = "virtual-psplash virtual-psplash-support" + +PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" +PACKAGES =+ "${PN}-set-default-theme" + +FILES:${PN}-initrd = "${libexecdir}/plymouth/*" +FILES:${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme" + +FILES:${PN} += "${systemd_unitdir}/system/*" + +DEPENDS = "libcap libpng libxkbcommon xkeyboard-config libevdev" +DEPENDS:append:libc-musl = " musl-rpmatch" + +LDFLAGS:append:libc-musl = " -lrpmatch" + +RDEPENDS:${PN}-initrd = "bash dracut" +RDEPENDS:${PN}-set-default-theme = "bash" + +SYSTEMD_SERVICE:${PN} = "plymouth-start.service" 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 cd8a6efbfe..dcac0cdc84 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 @@ -22,14 +22,14 @@ SRC_URI += " \ 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.8.0 \ + crate://crates.io/bstr/1.9.0 \ crate://crates.io/bumpalo/3.11.1 \ crate://crates.io/bytecount/0.6.7 \ 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.31 \ + crate://crates.io/chrono/0.4.32 \ crate://crates.io/clang-sys/1.4.0 \ crate://crates.io/clap/4.4.2 \ crate://crates.io/clap_builder/4.4.2 \ @@ -38,7 +38,7 @@ SRC_URI += " \ crate://crates.io/clap_mangen/0.2.9 \ crate://crates.io/colorchoice/1.0.0 \ crate://crates.io/compare/0.1.0 \ - crate://crates.io/console/0.15.7 \ + crate://crates.io/console/0.15.8 \ crate://crates.io/const-random/0.1.16 \ crate://crates.io/const-random-macro/0.1.16 \ crate://crates.io/constant_time_eq/0.3.0 \ @@ -51,19 +51,19 @@ SRC_URI += " \ crate://crates.io/cpp_macros/0.5.9 \ crate://crates.io/cpufeatures/0.2.5 \ crate://crates.io/crc32fast/1.3.2 \ - crate://crates.io/crossbeam-channel/0.5.8 \ - crate://crates.io/crossbeam-deque/0.8.2 \ - crate://crates.io/crossbeam-epoch/0.9.14 \ - crate://crates.io/crossbeam-utils/0.8.15 \ + crate://crates.io/crossbeam-channel/0.5.10 \ + crate://crates.io/crossbeam-deque/0.8.4 \ + crate://crates.io/crossbeam-epoch/0.9.17 \ + crate://crates.io/crossbeam-utils/0.8.18 \ crate://crates.io/crossterm/0.27.0 \ 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.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 \ - crate://crates.io/data-encoding-macro-internal/0.1.11 \ + crate://crates.io/data-encoding/2.5.0 \ + crate://crates.io/data-encoding-macro/0.1.14 \ + crate://crates.io/data-encoding-macro-internal/0.1.12 \ crate://crates.io/diff/0.1.13 \ crate://crates.io/digest/0.10.7 \ crate://crates.io/dlv-list/0.5.0 \ @@ -72,11 +72,11 @@ SRC_URI += " \ 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.5 \ + crate://crates.io/errno/0.3.8 \ 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 \ + crate://crates.io/filetime/0.2.23 \ crate://crates.io/flate2/1.0.24 \ crate://crates.io/fnv/1.0.7 \ crate://crates.io/fs_extra/1.3.0 \ @@ -110,7 +110,7 @@ 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/itertools/0.11.0 \ + crate://crates.io/itertools/0.12.0 \ crate://crates.io/itoa/1.0.4 \ crate://crates.io/js-sys/0.3.64 \ crate://crates.io/keccak/0.1.4 \ @@ -118,23 +118,21 @@ 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.150 \ + crate://crates.io/libc/0.2.152 \ crate://crates.io/libloading/0.7.4 \ crate://crates.io/libm/0.2.7 \ - crate://crates.io/linux-raw-sys/0.1.4 \ crate://crates.io/linux-raw-sys/0.3.8 \ - crate://crates.io/linux-raw-sys/0.4.10 \ + crate://crates.io/linux-raw-sys/0.4.12 \ crate://crates.io/lock_api/0.4.9 \ crate://crates.io/log/0.4.17 \ - crate://crates.io/lscolors/0.15.0 \ + crate://crates.io/lscolors/0.16.0 \ crate://crates.io/match_cfg/0.1.0 \ crate://crates.io/md-5/0.10.6 \ - crate://crates.io/memchr/2.6.2 \ + crate://crates.io/memchr/2.7.1 \ 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/mio/0.8.10 \ crate://crates.io/nix/0.27.1 \ crate://crates.io/nom/7.1.3 \ crate://crates.io/notify/6.0.1 \ @@ -144,13 +142,13 @@ SRC_URI += " \ 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 \ + crate://crates.io/once_cell/1.19.0 \ crate://crates.io/onig/6.4.0 \ crate://crates.io/onig_sys/69.8.1 \ crate://crates.io/ordered-multimap/0.6.0 \ 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/parking_lot_core/0.9.9 \ crate://crates.io/parse_datetime/0.5.0 \ crate://crates.io/peeking_take_while/0.1.2 \ crate://crates.io/phf/0.11.2 \ @@ -164,7 +162,6 @@ SRC_URI += " \ crate://crates.io/portable-atomic/0.3.15 \ crate://crates.io/ppv-lite86/0.2.17 \ crate://crates.io/pretty_assertions/1.4.0 \ - crate://crates.io/proc-macro-hack/0.5.20+deprecated \ crate://crates.io/proc-macro2/1.0.63 \ crate://crates.io/procfs/0.16.0 \ crate://crates.io/procfs-core/0.16.0 \ @@ -177,11 +174,10 @@ SRC_URI += " \ crate://crates.io/rand_pcg/0.3.1 \ 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/redox_syscall/0.4.1 \ crate://crates.io/reference-counted-singleton/0.1.2 \ - crate://crates.io/regex/1.10.2 \ - crate://crates.io/regex-automata/0.4.3 \ + crate://crates.io/regex/1.10.3 \ + crate://crates.io/regex-automata/0.4.4 \ crate://crates.io/regex-syntax/0.8.2 \ crate://crates.io/relative-path/1.8.0 \ crate://crates.io/rlimit/0.10.1 \ @@ -191,12 +187,11 @@ SRC_URI += " \ crate://crates.io/rust-ini/0.19.0 \ crate://crates.io/rustc-hash/1.1.0 \ crate://crates.io/rustc_version/0.4.0 \ - crate://crates.io/rustix/0.36.15 \ crate://crates.io/rustix/0.37.26 \ - crate://crates.io/rustix/0.38.21 \ + crate://crates.io/rustix/0.38.30 \ crate://crates.io/same-file/1.0.6 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/self_cell/1.0.2 \ + crate://crates.io/self_cell/1.0.3 \ crate://crates.io/selinux/0.4.0 \ crate://crates.io/selinux-sys/0.6.2 \ crate://crates.io/semver/1.0.14 \ @@ -211,13 +206,13 @@ SRC_URI += " \ crate://crates.io/siphasher/0.3.10 \ crate://crates.io/slab/0.4.7 \ crate://crates.io/sm3/0.4.2 \ - crate://crates.io/smallvec/1.11.0 \ + crate://crates.io/smallvec/1.13.0 \ crate://crates.io/smawk/0.3.1 \ crate://crates.io/socket2/0.5.3 \ crate://crates.io/strsim/0.10.0 \ crate://crates.io/syn/1.0.109 \ crate://crates.io/syn/2.0.23 \ - crate://crates.io/tempfile/3.8.1 \ + crate://crates.io/tempfile/3.9.0 \ crate://crates.io/terminal_size/0.2.6 \ crate://crates.io/terminal_size/0.3.0 \ crate://crates.io/textwrap/0.16.0 \ @@ -253,23 +248,32 @@ SRC_URI += " \ 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 \ + crate://crates.io/windows-sys/0.52.0 \ crate://crates.io/windows-targets/0.42.2 \ crate://crates.io/windows-targets/0.48.0 \ + crate://crates.io/windows-targets/0.52.0 \ crate://crates.io/windows_aarch64_gnullvm/0.42.2 \ crate://crates.io/windows_aarch64_gnullvm/0.48.0 \ + crate://crates.io/windows_aarch64_gnullvm/0.52.0 \ crate://crates.io/windows_aarch64_msvc/0.42.2 \ crate://crates.io/windows_aarch64_msvc/0.48.0 \ + crate://crates.io/windows_aarch64_msvc/0.52.0 \ crate://crates.io/windows_i686_gnu/0.42.2 \ crate://crates.io/windows_i686_gnu/0.48.0 \ + crate://crates.io/windows_i686_gnu/0.52.0 \ crate://crates.io/windows_i686_msvc/0.42.2 \ crate://crates.io/windows_i686_msvc/0.48.0 \ + crate://crates.io/windows_i686_msvc/0.52.0 \ crate://crates.io/windows_x86_64_gnu/0.42.2 \ crate://crates.io/windows_x86_64_gnu/0.48.0 \ + crate://crates.io/windows_x86_64_gnu/0.52.0 \ crate://crates.io/windows_x86_64_gnullvm/0.42.2 \ crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ + crate://crates.io/windows_x86_64_gnullvm/0.52.0 \ crate://crates.io/windows_x86_64_msvc/0.42.2 \ crate://crates.io/windows_x86_64_msvc/0.48.0 \ - crate://crates.io/xattr/1.0.1 \ + crate://crates.io/windows_x86_64_msvc/0.52.0 \ + crate://crates.io/xattr/1.3.1 \ crate://crates.io/yansi/0.5.1 \ crate://crates.io/z85/3.0.5 \ crate://crates.io/zip/0.6.6 \ @@ -295,14 +299,14 @@ SRC_URI[bitflags-2.4.0.sha256sum] = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc 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.8.0.sha256sum] = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +SRC_URI[bstr-1.9.0.sha256sum] = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" SRC_URI[bumpalo-3.11.1.sha256sum] = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" SRC_URI[bytecount-0.6.7.sha256sum] = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" 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.31.sha256sum] = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +SRC_URI[chrono-0.4.32.sha256sum] = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" SRC_URI[clang-sys-1.4.0.sha256sum] = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" SRC_URI[clap-4.4.2.sha256sum] = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" SRC_URI[clap_builder-4.4.2.sha256sum] = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" @@ -311,7 +315,7 @@ SRC_URI[clap_lex-0.5.0.sha256sum] = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39a SRC_URI[clap_mangen-0.2.9.sha256sum] = "bb0f09a0ca8f0dd8ac92c546b426f466ef19828185c6d504c80c48c9c2768ed9" SRC_URI[colorchoice-1.0.0.sha256sum] = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" SRC_URI[compare-0.1.0.sha256sum] = "120133d4db2ec47efe2e26502ee984747630c67f51974fca0b6c1340cf2368d3" -SRC_URI[console-0.15.7.sha256sum] = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" SRC_URI[const-random-0.1.16.sha256sum] = "11df32a13d7892ec42d51d3d175faba5211ffe13ed25d4fb348ac9e9ce835593" SRC_URI[const-random-macro-0.1.16.sha256sum] = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" SRC_URI[constant_time_eq-0.3.0.sha256sum] = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" @@ -324,19 +328,19 @@ SRC_URI[cpp_common-0.5.9.sha256sum] = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df SRC_URI[cpp_macros-0.5.9.sha256sum] = "47ec9cc90633446f779ef481a9ce5a0077107dd5b87016440448d908625a83fd" SRC_URI[cpufeatures-0.2.5.sha256sum] = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -SRC_URI[crossbeam-channel-0.5.8.sha256sum] = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -SRC_URI[crossbeam-deque-0.8.2.sha256sum] = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -SRC_URI[crossbeam-epoch-0.9.14.sha256sum] = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -SRC_URI[crossbeam-utils-0.8.15.sha256sum] = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +SRC_URI[crossbeam-channel-0.5.10.sha256sum] = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +SRC_URI[crossbeam-deque-0.8.4.sha256sum] = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +SRC_URI[crossbeam-epoch-0.9.17.sha256sum] = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +SRC_URI[crossbeam-utils-0.8.18.sha256sum] = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" SRC_URI[crossterm-0.27.0.sha256sum] = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" 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.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" -SRC_URI[data-encoding-macro-internal-0.1.11.sha256sum] = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" +SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +SRC_URI[data-encoding-macro-0.1.14.sha256sum] = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" +SRC_URI[data-encoding-macro-internal-0.1.12.sha256sum] = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" 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" @@ -345,11 +349,11 @@ SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944ae 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.5.sha256sum] = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" 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" +SRC_URI[filetime-0.2.23.sha256sum] = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" SRC_URI[flate2-1.0.24.sha256sum] = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" @@ -383,7 +387,7 @@ 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[itertools-0.11.0.sha256sum] = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +SRC_URI[itertools-0.12.0.sha256sum] = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" SRC_URI[itoa-1.0.4.sha256sum] = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" SRC_URI[keccak-0.1.4.sha256sum] = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" @@ -391,23 +395,21 @@ 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.150.sha256sum] = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +SRC_URI[libc-0.2.152.sha256sum] = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" 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" SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" -SRC_URI[linux-raw-sys-0.4.10.sha256sum] = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +SRC_URI[linux-raw-sys-0.4.12.sha256sum] = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" SRC_URI[log-0.4.17.sha256sum] = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -SRC_URI[lscolors-0.15.0.sha256sum] = "bf7015a04103ad78abb77e4b79ed151e767922d1cfde5f62640471c629a2320d" +SRC_URI[lscolors-0.16.0.sha256sum] = "ab0b209ec3976527806024406fe765474b9a1750a0ed4b8f0372364741f50e7b" SRC_URI[match_cfg-0.1.0.sha256sum] = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -SRC_URI[memchr-2.6.2.sha256sum] = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" +SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" 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[mio-0.8.10.sha256sum] = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" SRC_URI[nix-0.27.1.sha256sum] = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" SRC_URI[notify-6.0.1.sha256sum] = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" @@ -417,13 +419,13 @@ SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d 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" +SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" SRC_URI[onig-6.4.0.sha256sum] = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" SRC_URI[onig_sys-69.8.1.sha256sum] = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" SRC_URI[ordered-multimap-0.6.0.sha256sum] = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" 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[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" 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" @@ -437,7 +439,6 @@ SRC_URI[platform-info-2.0.2.sha256sum] = "d6259c4860e53bf665016f1b2f46a8859cadfa SRC_URI[portable-atomic-0.3.15.sha256sum] = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -SRC_URI[proc-macro-hack-0.5.20+deprecated.sha256sum] = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" SRC_URI[proc-macro2-1.0.63.sha256sum] = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" SRC_URI[procfs-0.16.0.sha256sum] = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" SRC_URI[procfs-core-0.16.0.sha256sum] = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" @@ -450,11 +451,10 @@ SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a SRC_URI[rand_pcg-0.3.1.sha256sum] = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" 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[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" SRC_URI[reference-counted-singleton-0.1.2.sha256sum] = "f1bfbf25d7eb88ddcbb1ec3d755d0634da8f7657b2cb8b74089121409ab8228f" -SRC_URI[regex-1.10.2.sha256sum] = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -SRC_URI[regex-automata-0.4.3.sha256sum] = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +SRC_URI[regex-automata-0.4.4.sha256sum] = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" 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" @@ -464,12 +464,11 @@ SRC_URI[rstest_macros-0.18.2.sha256sum] = "d428f8247852f894ee1be110b375111b586d4 SRC_URI[rust-ini-0.19.0.sha256sum] = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -SRC_URI[rustix-0.36.15.sha256sum] = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" SRC_URI[rustix-0.37.26.sha256sum] = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" -SRC_URI[rustix-0.38.21.sha256sum] = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +SRC_URI[rustix-0.38.30.sha256sum] = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -SRC_URI[self_cell-1.0.2.sha256sum] = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" +SRC_URI[self_cell-1.0.3.sha256sum] = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" SRC_URI[selinux-0.4.0.sha256sum] = "a00576725d21b588213fbd4af84cd7e4cc4304e8e9bd6c0f5a1498a3e2ca6a51" SRC_URI[selinux-sys-0.6.2.sha256sum] = "806d381649bb85347189d2350728817418138d11d738e2482cb644ec7f3c755d" SRC_URI[semver-1.0.14.sha256sum] = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" @@ -484,13 +483,13 @@ SRC_URI[signal-hook-registry-1.4.0.sha256sum] = "e51e73328dc4ac0c7ccbda3a494dfa0 SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" -SRC_URI[smallvec-1.11.0.sha256sum] = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +SRC_URI[smallvec-1.13.0.sha256sum] = "3b187f0231d56fe41bfb12034819dd2bf336422a5866de41bc3fec4b2e3883e8" SRC_URI[smawk-0.3.1.sha256sum] = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" SRC_URI[socket2-0.5.3.sha256sum] = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" SRC_URI[syn-2.0.23.sha256sum] = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" -SRC_URI[tempfile-3.8.1.sha256sum] = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +SRC_URI[tempfile-3.9.0.sha256sum] = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" 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" @@ -526,23 +525,32 @@ SRC_URI[winapi-util-0.1.6.sha256sum] = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5 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" +SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" SRC_URI[windows-targets-0.42.2.sha256sum] = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" SRC_URI[windows-targets-0.48.0.sha256sum] = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +SRC_URI[windows-targets-0.52.0.sha256sum] = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" SRC_URI[windows_aarch64_gnullvm-0.42.2.sha256sum] = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" SRC_URI[windows_aarch64_gnullvm-0.48.0.sha256sum] = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +SRC_URI[windows_aarch64_gnullvm-0.52.0.sha256sum] = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" SRC_URI[windows_aarch64_msvc-0.42.2.sha256sum] = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" SRC_URI[windows_aarch64_msvc-0.48.0.sha256sum] = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +SRC_URI[windows_aarch64_msvc-0.52.0.sha256sum] = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" SRC_URI[windows_i686_gnu-0.42.2.sha256sum] = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" SRC_URI[windows_i686_gnu-0.48.0.sha256sum] = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +SRC_URI[windows_i686_gnu-0.52.0.sha256sum] = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" SRC_URI[windows_i686_msvc-0.42.2.sha256sum] = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +SRC_URI[windows_i686_msvc-0.52.0.sha256sum] = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" SRC_URI[windows_x86_64_gnu-0.42.2.sha256sum] = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +SRC_URI[windows_x86_64_gnu-0.52.0.sha256sum] = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" SRC_URI[windows_x86_64_gnullvm-0.42.2.sha256sum] = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -SRC_URI[xattr-1.0.1.sha256sum] = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" SRC_URI[z85-3.0.5.sha256sum] = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" SRC_URI[zip-0.6.6.sha256sum] = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" diff --git a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.23.bb b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.23.bb deleted file mode 100644 index f0bb4d2674..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.23.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "coreutils ~ GNU coreutils (updated); implemented as universal (cross-platform) utils, written in Rust" -HOMEPAGE = "https://github.com/uutils/coreutils" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=41f7469eaacac62c67d5664fff2c062d" - -inherit cargo cargo-update-recipe-crates - -SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main" - -# musl not supported because the libc crate does not support functions like "endutxent" at the moment, -# so src/uucore/src/lib/features.rs disables utmpx when targetting musl. -COMPATIBLE_HOST:libc-musl = "null" - -SRCREV = "a3af2230a64d3b60832ce9944df5388a5ba9128a" -S = "${WORKDIR}/git" - -require ${BPN}-crates.inc - -include uutils-coreutils.inc diff --git a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils.inc b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.24.bb index 973b722ba3..775af5236c 100644 --- a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils.inc +++ b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.24.bb @@ -1,5 +1,22 @@ # Copyright (c) 2022, Snap Inc. # Released under the MIT license (see COPYING.MIT for the terms) +SUMMARY = "coreutils ~ GNU coreutils (updated); implemented as universal (cross-platform) utils, written in Rust" +HOMEPAGE = "https://github.com/uutils/coreutils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e74349878141b240070458d414ab3b64" + +inherit cargo cargo-update-recipe-crates + +SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main" + +# musl not supported because the libc crate does not support functions like "endutxent" at the moment, +# so src/uucore/src/lib/features.rs disables utmpx when targetting musl. +COMPATIBLE_HOST:libc-musl = "null" + +SRCREV = "169364044677bdea1e7d497fc638f947fd29c460" +S = "${WORKDIR}/git" + +require ${BPN}-crates.inc PROVIDES = "coreutils" RPROVIDES:${PN} = "coreutils" diff --git a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb index df6ca75461..d3922cf79e 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/pkcs11-helper/pkcs11-helper_1.30.0.bb @@ -20,7 +20,7 @@ SRC_URI = "git://github.com/OpenSC/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" # master SRCREV = "8bed16034f629a0361fa8ff89deed2b43dc45d8b" -PV .= "+1.30.0+git${SRCPV}" +PV .= "+1.30.0+git" UPSTREAM_CHECK_GITTAGREGEX = "pkcs11-helper-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 7e6ef42bc3..25dc15b466 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -33,7 +33,7 @@ S = "${WORKDIR}/mariadb-${PV}" BINCONFIG_GLOB = "mysql_config" -inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script pkgconfig +inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ ${PN}-setupdb:${bindir}/mariadb-install-db" @@ -42,10 +42,6 @@ INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME:${PN}-server = "mysqld" INITSCRIPT_PARAMS:${PN}-server ?= "start 45 5 . stop 45 0 6 1 ." -USERADD_PACKAGES = "${PN}-setupdb" -USERADD_PARAM:${PN}-setupdb = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" -GROUPADD_PARAM:${PN}-setupdb = "--system mysql" - INITSCRIPT_NAME:${PN}-setupdb = "install_db" INITSCRIPT_PARAMS:${PN}-setupdb ?= "defaults 44 44" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb index a4498fa44e..b1d1355e2b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb @@ -1,6 +1,8 @@ require mariadb.inc inherit ptest +inherit useradd + SRC_URI += "${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)}" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'rsync-native', '', d)}" RDEPENDS:${PN}-ptest += "cmake sed perl-module-test-more" @@ -36,6 +38,10 @@ DEPENDS += "mariadb-native bison-native boost libpcre2 curl ncurses \ PROVIDES += "mysql5 libmysqlclient" +USERADD_PACKAGES = "${PN}-setupdb" +USERADD_PARAM:${PN}-setupdb = "--system --home-dir /var/mysql -g mysql --shell /bin/false mysql" +GROUPADD_PARAM:${PN}-setupdb = "--system mysql" + RPROVIDES:${PN} += "mysql5" RREPLACES:${PN} += "mysql5" RCONFLICTS:${PN} += "mysql5" diff --git a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb index aed7977595..d872c4dbb5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/apitrace/apitrace_11.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \ file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" SRCREV = "9352fc02bba106fbbeef9e8452ef34643c0d0764" -PV .= "+11.1+git${SRCPV}" +PV .= "+11.1+git" SRC_URI = "gitsm://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 0000000000..943daf4d00 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch @@ -0,0 +1,31 @@ +From 45ea097e864e566771d756c92619e984815acd1e Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri <nathan@nathanm.com> +Date: Tue, 19 Dec 2023 14:35:05 -0800 +Subject: [PATCH] Fixed missing include for std::find_if. + +Throws an error when compiling on Windows. + +Upstream-Status: Backport [https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d] +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 +Reviewed-by: Ivan Penkov <ivanpe@chromium.org> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/common/module.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad8..b6f5da7e 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include <stdio.h> + #include <string.h> + ++#include <algorithm> + #include <functional> + #include <iostream> + #include <memory> +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb index 3462b846d3..3bf4371e85 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/breakpad/breakpad_2023.06.01.bb @@ -18,22 +18,18 @@ BBCLASSEXTEND = "native" PE = "2" -PV = "1.0" +SRCREV_FORMAT = "breakpad_gtest_protobuf_lss" -SRCREV_FORMAT = "breakpad_gtest_protobuf_lss_gyp" - -SRCREV_breakpad = "7a1a190f4f68e8a3e06788498f50a4d5520a69f3" -#v1.10.0 +SRCREV_breakpad = "8988364bcddd9b194b0bf931c10bc125987330ed" +#v1.11.0 SRCREV_gtest = "e2239ee6043f73722e7aa812a459f54a28552929" SRCREV_protobuf = "cb6dd4ef5f82e41e06179dcd57d3b1d9246ad6ac" SRCREV_lss = "9719c1e1e676814c456b55f5f070eabad6709d31" -SRCREV_gyp = "324dd166b7c0b39d513026fa52d6280ac6d56770" SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=https \ git://github.com/google/googletest.git;destsuffix=git/src/testing/gtest;name=gtest;branch=main;protocol=https \ git://github.com/protocolbuffers/protobuf.git;destsuffix=git/src/third_party/protobuf/protobuf;name=protobuf;branch=master;protocol=https \ git://chromium.googlesource.com/linux-syscall-support;protocol=https;branch=main;destsuffix=git/src/third_party/lss;name=lss \ - git://chromium.googlesource.com/external/gyp;protocol=https;destsuffix=git/src/tools/gyp;name=gyp;branch=master \ file://0001-include-sys-reg.h-to-get-__WORDSIZE-on-musl-libc.patch \ file://0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch \ file://0001-Turn-off-sign-compare-for-musl-libc.patch \ @@ -41,6 +37,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h file://0004-elf_reader.cc-include-sys-reg.h-to-get-__WORDSIZE-on.patch \ file://mcontext.patch \ file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ + file://0001-Fixed-missing-include-for-std-find_if.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_1.0.1.1.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb index 649bb39457..cb4aef5224 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_1.0.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://../LICENSE;md5=a05663ae6cca874123bf667a60dca8c9" SRC_URI = "git://github.com/sandstorm-io/capnproto.git;branch=release-${PV};protocol=https" -SRCREV = "15dc687f573311ac721c0df9d2123d2959268e92" +SRCREV = "1a0e12c0a3ba1f0dbbad45ddfef555166e0a14fc" S = "${WORKDIR}/git/c++" diff --git a/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb index 277fac9f7c..47a3d88853 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/concurrencykit/concurrencykit_git.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-2-Clause & Apache-2.0" HOMEPAGE = "http://concurrencykit.org" SECTION = "base" -PV = "0.7.0+git${SRCPV}" +PV = "0.7.0+git" SRCREV = "6e8e5bec2e2f8cef2072a68579cbb07ababf3331" LIC_FILES_CHKSUM = "file://LICENSE;md5=a0b24c1a8f9ad516a297d055b0294231" SRC_URI = "git://github.com/concurrencykit/ck.git;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb index a88042ba65..ed339e0160 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cpuid/cpuid_20230614.bb @@ -8,6 +8,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \ + file://0001-Makefile-update-the-hardcode-path-to-bindir-mandir.patch \ " SRC_URI[sha256sum] = "b1c83045efc26076307751e0662d580277f5f9bf89cf027231a7812003c3a4e8" @@ -15,9 +16,10 @@ COMPATIBLE_HOST = "(i.86|x86_64).*-linux" inherit perlnative -# The install rule from the Makefile has hardcoded paths, so we duplicate -# the actions to accommodate different paths. do_install () { - install -D -m 0755 ${B}/cpuid ${D}/${bindir}/cpuid - install -D -m 0444 ${B}/cpuid.man.gz ${D}/${mandir} + oe_runmake DESTDIR=${D} bindir=${bindir} mandir=${mandir} install } + +RDEPENDS:${PN} = "perl" + +INSANE_SKIP:${PN} += "already-stripped" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cpuid/files/0001-Makefile-update-the-hardcode-path-to-bindir-mandir.patch b/meta-openembedded/meta-oe/recipes-devtools/cpuid/files/0001-Makefile-update-the-hardcode-path-to-bindir-mandir.patch new file mode 100644 index 0000000000..8654fb86c3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cpuid/files/0001-Makefile-update-the-hardcode-path-to-bindir-mandir.patch @@ -0,0 +1,36 @@ +From 1339348c5b69b32378a638d65b16297d29c5fa22 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing.li@windriver.com> +Date: Tue, 7 Nov 2023 16:06:49 +0800 +Subject: [PATCH] Makefile: update the hardcode path to bindir/mandir + +Update the hardcode path to bindir/mandir + +Upstream-Status: Pending [ Send to cpuid@etallen.com ] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 828d2b1..365e26d 100644 +--- a/Makefile ++++ b/Makefile +@@ -55,10 +55,10 @@ cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man + gzip < $< > $@ + + install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz +- install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG) +- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz +- install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid +- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz ++ install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)${bindir}/$(PROG) ++ install -D -m 444 $(PROG).man.gz $(BUILDROOT)${mandir}/man1/$(PROG).1.gz ++ install -D -m 755 cpuinfo2cpuid $(BUILDROOT)${bindir}/cpuinfo2cpuid ++ install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)${mandir}/man1/cpuinfo2cpuid.1.gz + + clean: + rm -f $(PROG) $(PROG).i386 $(PROG).x86_64 +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20231231.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20240114.0.bb index b788d6fd03..6fab92015e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20231231.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20240114.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "e4cb2a0f9ba947d23e526888930bb1487c2cf1d8" +SRCREV = "be3439eb01caeadbf52a8ec4d00cb6cf16a61225" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatcc/flatcc/0001-Check-for-C-standard-version-23-for-__fallthrough__.patch b/meta-openembedded/meta-oe/recipes-devtools/flatcc/flatcc/0001-Check-for-C-standard-version-23-for-__fallthrough__.patch new file mode 100644 index 0000000000..c9ff55a167 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/flatcc/flatcc/0001-Check-for-C-standard-version-23-for-__fallthrough__.patch @@ -0,0 +1,31 @@ +From 7c199e3b191a6f714694035f1eba40112e71675c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 1 Feb 2024 18:41:51 -0800 +Subject: [PATCH] Check for C standard version >= 23 for [[__fallthrough__]] + +This avoids warnings with clang-18+ e.g. + +pprintint.h:256:6: error: [[]] attributes are a C23 extension [-Werror,-Wc23-extensions] + +Upstream-Status: Submitted [https://github.com/dvidelabs/flatcc/pull/273] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/flatcc/portable/pattributes.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/flatcc/portable/pattributes.h b/include/flatcc/portable/pattributes.h +index 9240fa3..dd4918a 100644 +--- a/include/flatcc/portable/pattributes.h ++++ b/include/flatcc/portable/pattributes.h +@@ -57,7 +57,7 @@ extern "C" { + + + /* https://en.cppreference.com/w/c/language/attributes/fallthrough */ +-#if PORTABLE_HAS_C_ATTRIBUTE(__fallthrough__) ++#if PORTABLE_HAS_C_ATTRIBUTE(__fallthrough__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L + # define pattribute_fallthrough [[__fallthrough__]] + #elif PORTABLE_HAS_ATTRIBUTE(__fallthrough__) + # define pattribute_fallthrough __attribute__((__fallthrough__)) +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatcc/flatcc_git.bb b/meta-openembedded/meta-oe/recipes-devtools/flatcc/flatcc_git.bb new file mode 100644 index 0000000000..2530dac526 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/flatcc/flatcc_git.bb @@ -0,0 +1,30 @@ +SUMMARY = "FlatCC FlatBuffers in C for C" +DESCRIPTION = "FlatCC is a compiler that generates FlatBuffers code for C \ +given a FlatBuffer schema file." +HOMEPAGE = "https://github.com/dvidelabs/flatcc" +SECTION = "devel/lib" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b3d8fb7158bf7e2600ba3191428dc4ef" + +PV = "0.6.2+git" + +SRC_URI = " \ + git://github.com/dvidelabs/flatcc.git;protocol=https;branch=master \ + file://0001-Check-for-C-standard-version-23-for-__fallthrough__.patch \ +" +SRCREV = "1653ec964730ec7d9892a08a1695ada6d20f5196" + +S = "${WORKDIR}/git" + +inherit cmake + +# Enable installation for target +# Disable tests as is not possible to execute with cross-compilation +EXTRA_OECMAKE += " \ + -DFLATCC_INSTALL=On \ + -DFLATCC_TEST=Off \ + -DFLATCC_ALLOW_WERROR=Off \ + -DFLATCC_INSTALL_LIB=${baselib} \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb index 15d43e9790..0d93297a07 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/guider/guider_3.9.8.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://github.com/iipeace/guider/issues" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=2c1c00f9d3ed9e24fa69b932b7e7aff2" -PV = "3.9.8+git${SRCPV}" +PV = "3.9.8+git" SRC_URI = "git://github.com/iipeace/${BPN};branch=master;protocol=https" SRCREV = "a502cd93b13235b7539557a91328de00b7c51bc3" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb index b2898c9c7f..39e18cdafd 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -20,7 +20,7 @@ SRC_URI = "\ " SRCREV = "07413cce72e19520af55dfcbc765484f5ab41dd9" -PV = "1.0.1+git${SRCPV}" +PV = "1.0.1+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb b/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.20.bb index f5eda17f48..0fb68d8684 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.19.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/lshw/lshw_02.20.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64|riscv64).*-linux" -PV .= "+git${SRCPV}" -SRCREV = "b4e067307906ec6f277cce5c8a882f5edd03cbbc" +PV .= "+git" +SRCREV = "4c6497c8b0a67cd9fa9693e9101a7cafd3297e81" SRC_URI = " \ git://github.com/lyonel/lshw.git;protocol=https;branch=master \ file://0001-disable-docbook2man.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index d690dd4f02..63971970cf 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -10,7 +10,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" PE = "1" -PV = "7.91+git${SRCPV}" +PV = "7.91+git" SRCREV = "c22d359433b333937ee3d803450dc41998115685" DEPENDS = "elfutils" diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb index cadc9843d9..240271d410 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -91,10 +91,7 @@ FILES:${PN}-dev += "${libdir}/libluajit-5.1.a \ " FILES:luajit-common = "${datadir}/${BPN}-${PV}" -# mips64/ppc/ppc64/riscv64/riscv32 is not supported in this release -COMPATIBLE_HOST:mipsarchn32 = "null" -COMPATIBLE_HOST:mipsarchn64 = "null" -COMPATIBLE_HOST:powerpc = "null" +# ppc64/riscv64/riscv32 is not supported in this release COMPATIBLE_HOST:powerpc64 = "null" COMPATIBLE_HOST:powerpc64le = "null" COMPATIBLE_HOST:riscv64 = "null" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb index b5d05d40e5..36e46021bb 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nlohmann-fifo/nlohmann-fifo_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.MIT;md5=b67209a1e36b682a8226de19d265b1e0" SRC_URI = "git://github.com/nlohmann/fifo_map.git;branch=master;protocol=https" -PV = "1.0.0+git${SRCPV}" +PV = "1.0.0+git" SRCREV = "d732aaf9a315415ae8fd7eb11e3a4c1f80e42a48" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.5/oe-npm-cache b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.11/oe-npm-cache index f596207648..f596207648 100755 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.5/oe-npm-cache +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.11/oe-npm-cache diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.5.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.11.bb index a61dd5018f..a61dd5018f 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.11.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.11.0.bb index 0ca0c1498a..cc51354786 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.11.0.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=162595a4a2f3453a0534e60b0afe4e7b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=78ad16dab3c1d15d4878c81770be0be7" CVE_PRODUCT = "nodejs node.js" @@ -27,8 +27,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ 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 \ - file://0001-build-fix-build-with-Python-3.12.patch \ - file://0001-gyp-resolve-python-3.12-issues.patch \ " SRC_URI:append:class-target = " \ @@ -40,10 +38,12 @@ 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] = "f799c66f6a6386bb8ac2c75a378f740c455e97f1fe964393dd39c9f9f6efbc70" +SRC_URI[sha256sum] = "31807ebeeeb049c53f1765e4a95aed69476a4b696dd100cb539ab668d7950b40" S = "${WORKDIR}/node-v${PV}" +CVE_PRODUCT += "node.js" + # v8 errors out if you have set CCACHE CCACHE = "" diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb index 19ef987387..559fe29ff8 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd_git.bb @@ -17,7 +17,7 @@ SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba" SRCREV_jimtcl = "fcbb4499a6b46ef69e7a95da53e30796e20817f0" SRCREV_libjaylink = "9aa7a5957c07bb6e862fc1a6d3153d109c7407e4" -PV = "0.12+gitr${SRCPV}" +PV = "0.12+git" S = "${WORKDIR}/git" inherit pkgconfig autotools-brokensep gettext diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service index eec76fb563..918ffe6749 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php/php-fpm.service @@ -1,10 +1,57 @@ +# It's not recommended to modify this file in-place, because it +# will be overwritten during upgrades. If you want to customize, +# the best way is to use the "systemctl edit" command. + [Unit] -Description=PHP-FPM +Description=The PHP FastCGI Process Manager After=network.target + [Service] -Type=forking -PIDFile=/run/php-fpm.pid -ExecStart=@SYSCONFDIR@/init.d/php-fpm start -ExecStop=@SYSCONFDIR@/init.d/php-fpm stop +Type=simple +PIDFile=@LOCALSTATEDIR@/run/php-fpm.pid +ExecStart=@SBINDIR@/php-fpm --nodaemonize --fpm-config /etc/php-fpm.conf +ExecReload=@BINDIR@/kill -USR2 $MAINPID + +# Set up a new file system namespace and mounts private /tmp and /var/tmp directories +# so this service cannot access the global directories and other processes cannot +# access this service's directories. +PrivateTmp=true + +# Mounts the /usr, /boot, and /etc directories read-only for processes invoked by this unit. +ProtectSystem=full + +# Sets up a new /dev namespace for the executed processes and only adds API pseudo devices +# such as /dev/null, /dev/zero or /dev/random (as well as the pseudo TTY subsystem) to it, +# but no physical devices such as /dev/sda. +PrivateDevices=true + +# Explicit module loading will be denied. This allows to turn off module load and unload +# operations on modular kernels. It is recommended to turn this on for most services that +# do not need special file systems or extra kernel modules to work. +ProtectKernelModules=true + +# Kernel variables accessible through /proc/sys, /sys, /proc/sysrq-trigger, /proc/latency_stats, +# /proc/acpi, /proc/timer_stats, /proc/fs and /proc/irq will be made read-only to all processes +# of the unit. Usually, tunable kernel variables should only be written at boot-time, with the +# sysctl.d(5) mechanism. Almost no services need to write to these at runtime; it is hence +# recommended to turn this on for most services. +ProtectKernelTunables=true + +# The Linux Control Groups (cgroups(7)) hierarchies accessible through /sys/fs/cgroup will be +# made read-only to all processes of the unit. Except for container managers no services should +# require write access to the control groups hierarchies; it is hence recommended to turn this on +# for most services +ProtectControlGroups=true + +# Any attempts to enable realtime scheduling in a process of the unit are refused. +RestrictRealtime=true + +# Restricts the set of socket address families accessible to the processes of this unit. +# Protects against vulnerabilities such as CVE-2016-8655 +RestrictAddressFamilies=AF_INET AF_INET6 AF_NETLINK AF_UNIX + +# Takes away the ability to create or manage any kind of namespace +RestrictNamespaces=true + [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.9.bb index cb9d0060a3..e645a284d5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.9.bb @@ -44,7 +44,7 @@ CVE_STATUS_PHP = " \ CVE-2007-4596 \ " -inherit autotools pkgconfig python3native gettext multilib_header multilib_script +inherit autotools pkgconfig python3native gettext multilib_header multilib_script systemd # phpize is not scanned for absolute paths by default (but php-config is). # @@ -193,11 +193,11 @@ do_install:append:class-target() { install -m 0644 ${WORKDIR}/php-fpm-apache.conf ${D}/${sysconfdir}/apache2/conf.d/php-fpm.conf if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)};then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ - ${D}${systemd_unitdir}/system/php-fpm.service + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/php-fpm.service ${D}${systemd_system_unitdir}/php-fpm.service + sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_system_unitdir}/php-fpm.service + sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/php-fpm.service + sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/php-fpm.service fi if ${@bb.utils.contains('PACKAGECONFIG', 'apache2', 'true', 'false', d)}; then @@ -259,7 +259,7 @@ FILES:${PN}-cli = "${bindir}/php" FILES:${PN}-phpdbg = "${bindir}/phpdbg" FILES:${PN}-phar = "${bindir}/phar*" FILES:${PN}-cgi = "${bindir}/php-cgi" -FILES:${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${systemd_unitdir}/system/php-fpm.service ${sysconfdir}/php-fpm.d/www.conf.default" +FILES:${PN}-fpm = "${sbindir}/php-fpm ${sysconfdir}/php-fpm.conf ${datadir}/fpm ${sysconfdir}/init.d/php-fpm ${sysconfdir}/php-fpm.d/www.conf.default" FILES:${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" CONFFILES:${PN}-fpm = "${sysconfdir}/php-fpm.conf" CONFFILES:${PN}-fpm-apache2 = "${sysconfdir}/apache2/conf.d/php-fpm.conf" @@ -290,6 +290,9 @@ RPROVIDES:${PN}-modphp = "${MODPHP_OLDPACKAGE}" RREPLACES:${PN}-modphp = "${MODPHP_OLDPACKAGE}" RCONFLICTS:${PN}-modphp = "${MODPHP_OLDPACKAGE}" +SYSTEMD_SERVICE:${PN}-fpm = "php-fpm.service" +SYSTEMD_PACKAGES += "${PN}-fpm" + do_install:append:class-native() { create_wrapper ${D}${bindir}/php \ PHP_PEAR_SYSCONF_DIR=${sysconfdir}/ diff --git a/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb b/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb index 56d895a099..ad149de12c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pmtools/pmtools_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://lesswatts.org/projects/acpi" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -PV = "20130209+git${SRCPV}" +PV = "20130209+git" SRC_URI = "git://github.com/anyc/pmtools.git;branch=master;protocol=https \ file://pmtools-switch-to-dynamic-buffer-for-huge-ACPI-table.patch \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python3-apscheduler_3.10.4.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python3-apscheduler_3.10.4.bb new file mode 100644 index 0000000000..01ffa25ac6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python3-apscheduler_3.10.4.bb @@ -0,0 +1,13 @@ +SUMMARY = "Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed later, either just once or periodically." +HOMEPAGE = "https://github.com/agronholm/apscheduler" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f0e423eea5c91e7aa21bdb70184b3e53" + +SRC_URI[sha256sum] = "e6df071b27d9be898e486bc7940a7be50b4af2e9da7c08f0744a96d4bd4cef4a" + +PYPI_PACKAGE = "APScheduler" + +inherit pypi python_setuptools_build_meta + +DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb index 65294fafad..8519479c4d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/rapidjson/rapidjson_git.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/miloyip/rapidjson.git;branch=master;protocol=https" SRCREV = "0ccdbf364c577803e2a751f5aededce935314313" -PV = "1.1.0+git${SRCPV}" +PV = "1.1.0+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.8.1.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.8.2.bb index e045431d6b..5df494fa73 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.8.2.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" inherit pypi setuptools3 python3native PYPI_PACKAGE = "sip" -SRC_URI[sha256sum] = "3002df415e168ac3ffe393942dbc7131cb82ade50000e1526f46a88ade26f598" +SRC_URI[sha256sum] = "2e65a423037422ccfde095c257703a8ff45cc1c89bdaa294d7819bc836c87639" RDEPENDS:${PN} = " \ python3-core \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/smemstat/smemstat_0.02.12.bb b/meta-openembedded/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb index 46dc94154d..bf5c52fe50 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/smemstat/smemstat_0.02.12.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/smemstat/smemstat_0.02.13.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "ncurses" SRC_URI = "git://github.com/ColinIanKing/smemstat.git;protocol=https;branch=master" -SRCREV = "72efeb08ccdb22f57054279d25e3c522e8e1d4c3" +SRCREV = "1edc560602aa116b96408110b8b9d66a4edef60e" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.14.bb b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.15.2.bb index 415cfe1b0f..ff04d40eaf 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.14.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uftrace/uftrace_0.15.2.bb @@ -1,4 +1,4 @@ -SUMMARY = "Trace and analyze execution of a program written in C/C++" +SUMMARY = "Trace and analyze execution of a program written in C/C++, Rust and Python" HOMEPAGE = "https://github.com/namhyung/uftrace" BUGTRACKER = "https://github.com/namhyung/uftrace/issues" SECTION = "devel" @@ -10,7 +10,7 @@ DEPENDS:append:libc-musl = " argp-standalone" inherit autotools -SRCREV = "04d73dc31cafef4161321e3c2443a5490ef93018" +SRCREV = "9d8657e90b918994d7d2bcf6dd2cc7354c35a1b4" SRC_URI = "git://github.com/namhyung/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" @@ -36,7 +36,7 @@ do_configure() { FILES_SOLIBSDEV = "" FILES:${PN} += "${libdir}/*.so" -COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm)" +COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|riscv64)" # uftrace supports armv6 and above COMPATIBLE_HOST:armv4 = 'null' diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb index 26540b4295..079f805d6c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a12d8903508fb6bfd49d8d82c6170dd9" DEPENDS += "flex-native bison-native" PACKAGECONFIG[docs] = ",,xmlto-native," -PV = "1.3.0+git${SRCPV}" +PV = "1.3.0+git" # v1.3.0 SRCREV = "ba463d3c26c0ece2e797b8d6381b161633b5971a" SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb index 28db39ac20..3d438871ed 100644 --- a/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "\ DEPENDS = "boost" SRCREV = "42ebcec9dc2c99a1b3a4542787572045763ad196" -PV = "0.6.3+git${SRCPV}" +PV = "0.6.3+git" SRC_URI = "\ git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb index e8299bab5f..401d53c79c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb @@ -19,6 +19,5 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON" -INSANE_SKIP:${PN}:append = " ldflags" SOLIBS = ".so" FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb b/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb index 61b050aac6..9789ac16d4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/figlet/figlet_git.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/cmatsuoka/figlet.git;branch=master;protocol=https \ file://0001-build-add-autotools-support-to-allow-easy-cross-comp.patch" SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3" S = "${WORKDIR}/git" -PV = "2.2.5+git${SRCPV}" +PV = "2.2.5+git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb index 19f6f45fc1..97e57c13d5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb @@ -37,11 +37,9 @@ DEPENDS = " \ " RDEPENDS:${PN} = " \ - bubblewrap \ ca-certificates \ dconf \ flatpak-xdg-utils \ - xdg-dbus-proxy \ " GIR_MESON_OPTION = "gir" diff --git a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.25.bb b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.26.bb index 8d19c62980..9b36b57cb7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.25.bb +++ b/meta-openembedded/meta-oe/recipes-extended/iotop/iotop_1.26.bb @@ -1,11 +1,11 @@ SUMMARY = "A top utility for I/O" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=72ad44c0841d1e759669d27744e39389" +LIC_FILES_CHKSUM = "file://LICENSE;md5=686f457fedcecd9b92d69e625291ffa2" DEPENDS = "ncurses" SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https" -SRCREV = "9d60bb7e262e0d41b0aa3bcfaa806fa4f42e548a" +SRCREV = "b15743b04bb04ff1fc6e197d21ba30365349edcb" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb index 39d6459227..bfa0e79d8f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb @@ -2,7 +2,7 @@ SUMMARY = "A handy serial sniffer" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" -PV = "2.3.6+git${SRCPV}" +PV = "2.3.6+git" SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=https;branch=master" SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545" 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 6f2ead9a8d..d540737bc9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb @@ -10,7 +10,7 @@ DEPENDS += "libunwind" SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=master" -PV = "1.0+git${SRCPV}" +PV = "1.0+git" SRCREV = "9ae4f4ae4481b1e69d38ed810980d33103544613" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.0.4.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.0.bb index d6ee103bb3..60182d84eb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.0.bb @@ -15,7 +15,7 @@ DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" SRC_URI = "git://github.com/storaged-project/libblockdev;branch=master;protocol=https \ file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ " -SRCREV = "ec0120de06f28ecfc10953b712f7f42735787bcf" +SRCREV = "65f50bf912374b85d673f2716ea0c8306980c95b" S = "${WORKDIR}/git" FILES:${PN} += "${libdir}/python3.*/site-packages" diff --git a/meta-openembedded/meta-oe/recipes-extended/libcbor/libcbor_0.10.2.bb b/meta-openembedded/meta-oe/recipes-extended/libcbor/libcbor_0.11.0.bb index 3ac270e5e0..28bd5b5ae2 100755 --- a/meta-openembedded/meta-oe/recipes-extended/libcbor/libcbor_0.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libcbor/libcbor_0.11.0.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071" SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master" -SRCREV = "efa6c0886bae46bdaef9b679f61f4b9d8bc296ae" +SRCREV = "170bee2b82cdb7b2ed25af301f62cb6efdd40ec1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb index 6fbc28394f..26dd821f96 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb @@ -8,7 +8,7 @@ DEPENDS = "libxml2 glib-2.0 swig python3" inherit autotools pkgconfig python3native python3targetconfig -PV = "2.3.0+git${SRCPV}" +PV = "2.3.0+git" SRCREV = "2cd858c679d25633077ca78b67182a9b77653816" SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb index 91a9b4af2c..b9f5c34094 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb @@ -7,7 +7,7 @@ DEPENDS = "udev libusb1 libplist libimobiledevice-glue" inherit autotools pkgconfig gitpkgv PKGV = "${GITPKGVTAG}" -PV = "2.0.2+git${SRCPV}" +PV = "2.0.2+git" SRCREV = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a" SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb index 65bf9ba647..6e6c8cc226 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb @@ -7,7 +7,7 @@ SRCREV = "17d96e8f9a5bce7cee5e2222855ab46a246dba51" SRC_URI = "git://git.code.sf.net/p/libuio/code;branch=master;protocol=https" -PV .= "+0.2.2+git${SRCPV}" +PV .= "+0.2.2+git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.128.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb index 55dbb82029..0eff3247c6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.128.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad" -SRCREV = "7e5ea21030fe6632b6faad30c0de8d9669503773" +SRCREV = "fc4dbd923e044006c93df020590a1e5a8656c09e" 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/md5deep/md5deep_git.bb b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb index b1a38cf6f2..5351a37db6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/md5deep/md5deep_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://md5deep.sourceforge.net" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=9190f660105b9a56cdb272309bfd5491" -PV = "4.4+git${SRCPV}" +PV = "4.4+git" SRCREV = "877613493ff44807888ce1928129574be393cbb0" diff --git a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb index 61f36d724d..37bd36432f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -6,7 +6,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd" SRCREV = "3c288a09109969eef9c2da7d92d3c62f92a015cc" -PV = "2.2.0+git${SRCPV}" +PV = "2.2.0+git" SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \ file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana/0001-Include-stdlib.h-for-exit-and-abort-prototypes.patch b/meta-openembedded/meta-oe/recipes-extended/nana/nana/0001-Include-stdlib.h-for-exit-and-abort-prototypes.patch deleted file mode 100644 index f1712b17f5..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/nana/nana/0001-Include-stdlib.h-for-exit-and-abort-prototypes.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0e32b1a07b1b032576c7b0a73d7f1a090a50dd23 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 31 Aug 2022 10:40:52 -0700 -Subject: [PATCH] Include stdlib.h for exit and abort prototypes - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/I.c | 1 + - src/nana_error.c | 1 + - src/nanafilter.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/I.c b/src/I.c -index e4577ae..4761af4 100644 ---- a/src/I.c -+++ b/src/I.c -@@ -30,6 +30,7 @@ - - - #include <stdio.h> -+#include <stdlib.h> - #include <I.h> - - /* -diff --git a/src/nana_error.c b/src/nana_error.c -index 51f99f2..c3a67d2 100644 ---- a/src/nana_error.c -+++ b/src/nana_error.c -@@ -30,6 +30,7 @@ - - #include <nana_error.h> - #include <stdio.h> -+#include <stdlib.h> - - void nana_error(const char *message) { - fprintf(stderr, "nana_error: %s\n", message); -diff --git a/src/nanafilter.c b/src/nanafilter.c -index 191e8ef..1ab1978 100644 ---- a/src/nanafilter.c -+++ b/src/nanafilter.c -@@ -33,6 +33,7 @@ - static const char rcs[] ="Id: nanafilter.c,v 1.2 1998/06/10 06:58:55 pjm Exp "; - - #include <stdio.h> -+#include <stdlib.h> - - void do_input(void); - void do_string(void); --- -2.37.3 - diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana/0001-Makefile.am-fix-build-with-separate-build-dir.patch b/meta-openembedded/meta-oe/recipes-extended/nana/nana/0001-Makefile.am-fix-build-with-separate-build-dir.patch new file mode 100644 index 0000000000..aee27e803e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/nana/nana/0001-Makefile.am-fix-build-with-separate-build-dir.patch @@ -0,0 +1,27 @@ +From 22485e13c6e32e63ff522cd367bf63ab0a8848b1 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Wed, 7 Feb 2024 15:42:30 +0000 +Subject: [PATCH] Makefile.am: fix build with separate build dir + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +Upstream-Status: Pending +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 54ceda6..9e9ffe4 100755 +--- a/Makefile.am ++++ b/Makefile.am +@@ -33,7 +33,7 @@ PROJECTS: doc/nana.info + # + + showconfig: +- $(CPP) $(CPPFLAGS) -I$(top_srcdir)/src $(DEFS) $(top_srcdir)/showconfig.c | grep "==>" ++ $(CPP) $(CPPFLAGS) -I$(top_builddir)/src -I$(top_srcdir)/src $(DEFS) $(top_srcdir)/showconfig.c | grep "==>" + + # + # various targets for the maintainer to build patches, releases, etc. +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana/0002-man-Makefile.am-we-seem-not-to-need-the-work-around-.patch b/meta-openembedded/meta-oe/recipes-extended/nana/nana/0002-man-Makefile.am-we-seem-not-to-need-the-work-around-.patch new file mode 100644 index 0000000000..31a0f045a1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/nana/nana/0002-man-Makefile.am-we-seem-not-to-need-the-work-around-.patch @@ -0,0 +1,56 @@ +From 5519de933d851789a672d47be3f53258d036aa18 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Thu, 8 Feb 2024 14:12:17 +0100 +Subject: [PATCH] man/Makefile.am: we seem not to need the work around anymore + +* I'm trying to fix random build failure in world builds which sometimes + fail with: + +Making install in man +make[1]: Entering directory 'nana/2.5/nana-2.5/man' +make[2]: Entering directory 'nana/2.5/nana-2.5/man' +make[2]: Nothing to be done for 'install-exec-am'. + TOPDIR/BUILD/hosttools/mkdir -p 'nana/2.5/image/usr/share/man/man1' +installing nana.1 as /usr/share/man/man1/nana.1 + TOPDIR/BUILD/hosttools/mkdir -p 'nana/2.5/image/usr/share/man/man3' + TOPDIR/BUILD/hosttools/install -c -m 644 I.3 DI.3 L.3 DL.3 Q.3 Qstl.3 nana.3 'nana/2.5/image/usr/share/man/man3' + TOPDIR/BUILD/hosttools/install -c -m 644 nana.1 nana-clg.1 'nana/2.5/image/usr/share/man/man1' +TOPDIR/BUILD/hosttools/install: cannot create regular file 'nana/2.5/image/usr/share/man/man1/nana.1': File exists +make[2]: *** [Makefile:314: install-man1] Error 1 +make[2]: *** Waiting for unfinished jobs.... +make[2]: Leaving directory 'nana/2.5/nana-2.5/man' +make[1]: Leaving directory 'nana/2.5/nana-2.5/man' +make[1]: *** [Makefile:450: install-am] Error 2 +make: *** [Makefile:380: install-recursive] Error 1 + + I guess it's related to install-data-local work around in: + https://github.com/pjmaker/nana/blob/master/man/Makefile.am#L15 + + which might not be needed on some make versions and then it ends + installing nana.1 multiple times + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +Upstream-Status: Pending +--- + man/Makefile.am | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/man/Makefile.am b/man/Makefile.am +index 4cc5b28..3b2936d 100755 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -7,14 +7,3 @@ CLEANFILES = *~ + EXTRA_DIST = nana.1 nana-clg.1 I.3 DI.3 L.3 DL.3 Q.3 Qstl.3 nana.3 + + man_MANS = nana.1 nana-clg.1 I.3 DI.3 L.3 DL.3 Q.3 Qstl.3 nana.3 +- +-# We seem to have a problem with automake, if I include nana.1 in the +-# man_MANS variable we don't install it. The following dodgey aims +-# to fix it. +- +-install-data-local: +- @sect=1; \ +- inst=`echo "nana" | sed '$(transform)'`.1; \ +- echo installing nana.1 as $(mandir)/man$$sect/$$inst; \ +- $(INSTALL_DATA) $(srcdir)/nana.1 $(mandir)/man$$sect/$$inst +- diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch b/meta-openembedded/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch deleted file mode 100644 index 54098f721d..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/nana/nana/change-mandir-to-DESTDIR.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7b04c4873c0a4510bdaf9145bf01ca34b3549fdb Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Thu, 4 Dec 2014 03:50:19 +0900 -Subject: [PATCH 1/2] change mandir to DESTDIR - -Upstream-Status: Pending - -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - man/Makefile.am | 2 +- - man/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 80d24d8..944bc57 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -16,5 +16,5 @@ install-data-local: - @sect=1; \ - inst=`echo "nana" | sed '$(transform)'`.1; \ - echo installing nana.1 as $(mandir)/man$$sect/$$inst; \ -- $(INSTALL_DATA) $(srcdir)/nana.1 $(mandir)/man$$sect/$$inst -+ $(INSTALL_DATA) $(srcdir)/nana.1 $(DESTDIR)$(mandir)/man$$sect/$$inst - -diff --git a/man/Makefile.in b/man/Makefile.in -index 6008b20..64bb84c 100644 ---- a/man/Makefile.in -+++ b/man/Makefile.in -@@ -274,7 +274,7 @@ install-data-local: - @sect=1; \ - inst=`echo "nana" | sed '$(transform)'`.1; \ - echo installing nana.1 as $(mandir)/man$$sect/$$inst; \ -- $(INSTALL_DATA) $(srcdir)/nana.1 $(mandir)/man$$sect/$$inst -+ $(INSTALL_DATA) $(srcdir)/nana.1 $(DESTDIR)$(mandir)/man$$sect/$$inst - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. --- -1.8.4.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch b/meta-openembedded/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch deleted file mode 100644 index 043fd85500..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/nana/nana/modify-acinclude.m4-and-configure.in.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 679e33bfe74d713240fdd930602b993b937dce39 Mon Sep 17 00:00:00 2001 -From: Li xin <lixin.fnst@cn.fujitsu.com> -Date: Fri, 23 Jan 2015 03:30:47 +0900 -Subject: [PATCH] modify acinclude.m4 and configure.in - -this patch is from Debian to fix build errors. -"acinclude.m4:34: error: automatic de-ANSI-fication -support has been removed" - -Upstream-Status: Pending - -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - acinclude.m4 | 79 ------------------------------------------------------------ - configure.in | 12 +++++++++ - 2 files changed, 12 insertions(+), 79 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index e9e5500..d467fb5 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -30,82 +30,3 @@ AC_SUBST($1) - ## ------------------------------- ## - ## Check for function prototypes. ## - ## ------------------------------- ## -- --AC_DEFUN(fp_C_PROTOTYPES, --[AC_REQUIRE([AM_PROG_CC_STDC]) --AC_MSG_CHECKING([for function prototypes]) --if test "$ac_cv_prog_cc_stdc" != no; then -- AC_MSG_RESULT(yes) -- AC_DEFINE(PROTOTYPES) -- U= ANSI2KNR= --else -- AC_MSG_RESULT(no) -- U=_ ANSI2KNR=./ansi2knr --fi --AC_SUBST(U)dnl --AC_SUBST(ANSI2KNR)dnl --]) -- --## ----------------------------------------- ## --## ANSIfy the C compiler whenever possible. ## --## ----------------------------------------- ## -- --# @defmac AC_PROG_CC_STDC --# @maindex PROG_CC_STDC --# @ovindex CC --# If the C compiler in not in ANSI C mode by default, try to add an option --# to output variable @code{CC} to make it so. This macro tries various --# options that select ANSI C on some system or another. It considers the --# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and --# handles function prototypes correctly. --# --# If you use this macro, you should check after calling it whether the C --# compiler has been set to accept ANSI C; if not, the shell variable --# @code{ac_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source --# code in ANSI C, you can make an un-ANSIfied copy of it by using the --# program @code{ansi2knr}, which comes with Ghostscript. --# @end defmac -- --AC_DEFUN(fp_PROG_CC_STDC, --[AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) --AC_CACHE_VAL(ac_cv_prog_cc_stdc, --[ac_cv_prog_cc_stdc=no --ac_save_CFLAGS="$CFLAGS" --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX -Aa -D_HPUX_SOURCE --# SVR4 -Xc --for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc --do -- CFLAGS="$ac_save_CFLAGS $ac_arg" -- AC_TRY_COMPILE( --[#if !defined(__STDC__) || __STDC__ != 1 --choke me --#endif --], [int test (int i, double x); --struct s1 {int (*f) (int a);}; --struct s2 {int (*f) (double a);};], --[ac_cv_prog_cc_stdc="$ac_arg"; break]) --done --CFLAGS="$ac_save_CFLAGS" --]) --AC_MSG_RESULT($ac_cv_prog_cc_stdc) --case "x$ac_cv_prog_cc_stdc" in -- x|xno) ;; -- *) CC="$CC $ac_cv_prog_cc_stdc" ;; --esac --]) -- --## --------------------------------------------------------- ## --## Use AC_PROG_INSTALL, supplementing it with INSTALL_SCRIPT ## --## substitution. ## --## --------------------------------------------------------- ## -- --AC_DEFUN(fp_PROG_INSTALL, --[AC_PROG_INSTALL --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755' --AC_SUBST(INSTALL_SCRIPT)dnl --]) -- -diff --git a/configure.in b/configure.in -index 6b25ed5..a6a7f5b 100644 ---- a/configure.in -+++ b/configure.in -@@ -103,6 +103,12 @@ nana_DEFINE(DI_MAKE_VALID_BREAKPOINT,(exprn), - sparc-*-*|i?86-*-*) - DI_MAKE_VALID_BREAKPOINT='asm("nop")' - ;; -+ arm*-*-*|frv-*-*|mips*-*-*) -+ DI_MAKE_VALID_BREAKPOINT='asm("nop")' -+ ;; -+ sh*-*-*) -+ DI_MAKE_VALID_BREAKPOINT='asm("nop\n\tnop\n\t")' -+ ;; - esac - ]) - -@@ -113,6 +119,12 @@ nana_DEFINE(DL_MAKE_VALID_BREAKPOINT,(), - sparc-*-*|i?86-*-*) - DL_MAKE_VALID_BREAKPOINT='asm("nop")' - ;; -+ arm*-*-*|frv-*-*|mips*-*-*) -+ DL_MAKE_VALID_BREAKPOINT='asm("nop")' -+ ;; -+ sh*-*-*) -+ DL_MAKE_VALID_BREAKPOINT='asm("nop\n\tnop\n\t")' -+ ;; - esac - ]) - --- -1.8.4.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb b/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb deleted file mode 100644 index c109d4f0fc..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/nana/nana_2.5.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Support for assertion checking and logging in GNU C/C++" -DESCRIPTION = "GNU Nana is a free library providing improved support for assertion\ -checking (as in assert.h) and logging (printf style debugging) in \ -GNU C and C++." -SECTION = "Development/Languages/C and C++" - -SRC_URI = "http://download.savannah.gnu.org/releases/${BPN}/${BP}.tar.gz \ - file://change-mandir-to-DESTDIR.patch \ - file://modify-acinclude.m4-and-configure.in.patch \ - file://0001-Include-stdlib.h-for-exit-and-abort-prototypes.patch \ -" -SRC_URI[md5sum] = "66c88aa0ad095b2e67673773135475f1" -SRC_URI[sha256sum] = "fd1819ffea94b209513959447e4802afe2719600e7d161cd78b265a42812affa" - -LICENSE = "BSD-2-Clause" - -LIC_FILES_CHKSUM = "file://COPYING;md5=16aa57f3b7fdda870cee597275bd5d11" - -inherit autotools-brokensep pkgconfig texinfo - -EXTRA_OEMAKE = "DESTDIR=${D}" - -do_configure:prepend:class-nativesdk() { - sed -i -e 's:@CPP@:\$\{CXX\} \$\{CXXFLAGS\} \-E:g' ${S}/src/nana.in - sed -i -e 's:@CC@:\$\{CC\} \$\{CFLAGS\} \-E:g' ${S}/src/nana-clg.in - sed -i -e 's:@CXX@::g' ${S}/src/nana-c++lg.in - sed -i -e 's:@GDB@:\$\{GDB\}:g' ${S}/src/nana-run.in -} - -do_install:prepend() { - install -d ${D}${mandir}/man1 - install -d ${D}${mandir}/man3 - install -d ${D}${datadir}/info -} -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/nana/nana_git.bb b/meta-openembedded/meta-oe/recipes-extended/nana/nana_git.bb new file mode 100644 index 0000000000..7c748bc49b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/nana/nana_git.bb @@ -0,0 +1,44 @@ +SUMMARY = "Support for assertion checking and logging in GNU C/C++" +DESCRIPTION = "GNU Nana is a free library providing improved support for assertion\ +checking (as in assert.h) and logging (printf style debugging) in \ +GNU C and C++." +SECTION = "Development/Languages/C and C++" + +PV = "2.5+git" +SRCREV = "6d70617db8b9972e6c1008265fc228aba91c2042" +SRC_URI = "git://github.com/pjmaker/nana;protocol=https;branch=master \ + file://0001-Makefile.am-fix-build-with-separate-build-dir.patch \ + file://0002-man-Makefile.am-we-seem-not-to-need-the-work-around-.patch \ +" +S = "${WORKDIR}/git" + +LICENSE = "BSD-2-Clause" + +LIC_FILES_CHKSUM = "file://COPYING;md5=16aa57f3b7fdda870cee597275bd5d11" + +inherit autotools pkgconfig texinfo + +EXTRA_OEMAKE = "DESTDIR=${D}" + +do_configure:prepend() { + # make distclean but in ${S} + rm -rf ${S}/src/*.o ${S}/src/.deps \ + ${S}/Makefile ${S}/config.log ${S}/config.status \ + ${S}/doc/Makefile ${S}/doc/nana.pdf \ + ${S}/emacs/Makefile ${S}/examples/Makefile \ + ${S}/gdb/Makefile ${S}/gdb/nana-libtrace ${S}/gdb/nana-trace \ + ${S}/man/Makefile ${S}/perf/Makefile \ + ${S}/shortform/Makefile ${S}/shortform/nana-sfdir ${S}/shortform/nana-sfg \ + ${S}/src/Makefile ${S}/src/libnana.a \ + ${S}/src/nana ${S}/src/nana-c++lg ${S}/src/nana-clg ${S}/src/nana-config.h ${S}/src/nana-run ${S}/src/nanafilter \ + ${S}/test/Makefile ${S}/test/gammon +} + +do_configure:prepend:class-nativesdk() { + sed -i -e 's:@CPP@:\$\{CXX\} \$\{CXXFLAGS\} \-E:g' ${S}/src/nana.in + sed -i -e 's:@CC@:\$\{CC\} \$\{CFLAGS\} \-E:g' ${S}/src/nana-clg.in + sed -i -e 's:@CXX@::g' ${S}/src/nana-c++lg.in + sed -i -e 's:@GDB@:\$\{GDB\}:g' ${S}/src/nana-run.in +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.8.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.1.bb index 0704c9162f..d4ad765c08 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2023.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.1.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] = "b6fffc267188e40d60755e6d7f2be65831795baa53b0fd9dd6c6809c7e54796d" +SRC_URI[sha256sum] = "152327fe804512d4f896fb9b9e9cdc84ad9b4c0b205b8625472147d5a28164af" S = "${WORKDIR}/libostree-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb index bb9574feb2..dc7280f099 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/p8platform/p8platform_git.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://libcec.pulse-eight.com/" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://src/os.h;md5=752555fa94e82005d45fd201fee5bd33" -PV = "2.1.0.1+git${SRCPV}" +PV = "2.1.0.1+git" SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https" SRCREV = "a7cd0d5780ed80a4e70480d1650749f29e8a1fb2" diff --git a/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.20.bb b/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.22.bb index 5f45d7fbd6..07de357266 100644 --- a/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.20.bb +++ b/meta-openembedded/meta-oe/recipes-extended/plocate/plocate_1.1.22.bb @@ -11,4 +11,4 @@ DEPENDS = "zstd liburing" SRC_URI = "https://plocate.sesse.net/download/${BP}.tar.gz" -SRC_URI[sha256sum] = "9b3d2842a08e69633c0ffa480c139603514ce59f1d021c263e9301324976959f" +SRC_URI[sha256sum] = "3b7e4741b4aa2ec044e53eff06474a32a3fb1e928b9382351fe79d4c27fb0049" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_123.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_123.bb index 670fd995fb..df9d25e9f4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_123.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_123.bb @@ -46,7 +46,9 @@ SYSTEMD_AUTO_ENABLE = "disable" do_install:append() { #Fix up permissions on polkit rules.d to work with rpm4 constraints chmod 700 ${D}/${datadir}/polkit-1/rules.d + chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d } FILES:${PN} += "${libdir}/polkit-1 ${nonarch_libdir}/polkit-1 ${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb index 88a18aa137..25951c9de4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb @@ -6,7 +6,7 @@ SECTION = "libs" LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" -PV = "0.0.1+git${SRCPV}" +PV = "0.0.1+git" SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77" SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb b/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb index 056f28a0a4..0bc94121a7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb @@ -15,7 +15,7 @@ SRC_URI = "git://gitlab.com/CodethinkLabs/qad/qad;branch=main;protocol=https \ SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362" S = "${WORKDIR}/git" -PV = "0.0+git${SRCPV}" +PV = "0.0+git" DEPENDS = "cjson libmicrohttpd libdrm libpng" diff --git a/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_git.bb b/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_git.bb index 9c562d5a66..a87454fa95 100644 --- a/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master SRCREV = "44754f738c6534a4304a83d4c6e97b3d3193d887" -PV = "1.2+git${SRCPV}" +PV = "1.2+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch index e8d8b1d53f..01e53e3f21 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -1,4 +1,4 @@ -From e97a572d4aef099a961e43d528c0268e10d9f1e2 Mon Sep 17 00:00:00 2001 +From d9d1f9a501ef7caa80d1e6595218898e9989ec2b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 10 Sep 2019 20:04:26 -0700 Subject: [PATCH] src: Do not reset FINAL_LIBS @@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index ddabd44..5133884 100644 +index 39decee..f5efe82 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -118,7 +118,7 @@ endif +@@ -119,7 +119,7 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/0006-Define-correct-gregs-for-RISCV32.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch index 385b0aeed0..93c3595261 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/0006-Define-correct-gregs-for-RISCV32.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch @@ -1,4 +1,4 @@ -From b6b2c652abfa98093401b232baca8719c50cadf4 Mon Sep 17 00:00:00 2001 +From 634f62be6c135ece93cb4e44a69ce3cb66f394ca Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 26 Oct 2020 21:32:22 -0700 Subject: [PATCH] Define correct gregs for RISCV32 @@ -8,15 +8,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Updated patch for 6.2.8 Signed-off-by: Changqing Li <changqing.li@windriver.com> + --- src/debug.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/debug.c b/src/debug.c -index ebda858..90bc450 100644 +index 684f692..2ee151f 100644 --- a/src/debug.c +++ b/src/debug.c -@@ -1168,7 +1168,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) { +@@ -1215,7 +1215,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) { #endif #elif defined(__linux__) /* Linux */ @@ -27,7 +28,7 @@ index ebda858..90bc450 100644 GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip); #elif defined(__X86_64__) || defined(__x86_64__) GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip); -@@ -1350,8 +1352,28 @@ void logRegisters(ucontext_t *uc) { +@@ -1401,8 +1403,28 @@ void logRegisters(ucontext_t *uc) { #endif /* Linux */ #elif defined(__linux__) @@ -57,6 +58,3 @@ index ebda858..90bc450 100644 serverLog(LL_WARNING, "\n" "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/GNU_SOURCE-7.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch index 6e07c25c6a..6e07c25c6a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/GNU_SOURCE-7.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/hiredis-use-default-CC-if-it-is-set.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch index 7785acca5c..7785acca5c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/init-redis-server b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server index c5f335f57d..c5f335f57d 100755 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/init-redis-server +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch index bff07535de..20708eda1e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch @@ -1,4 +1,4 @@ -From 734ab2f7879c6f94fc18ea6a10adb9bd156ba769 Mon Sep 17 00:00:00 2001 +From aa3d31355f3cc140b1dc2f4fcff8e3c0aa261549 Mon Sep 17 00:00:00 2001 From: Venture Research <tech@ventureresearch.com> Date: Fri, 8 Feb 2013 20:22:19 -0600 Subject: [PATCH] lua: update Makefile to use environment build settings @@ -15,19 +15,18 @@ Signed-off-by: Armin Kuster <akust808@gmail.com> updated to work wtih 6.2.1 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> ---- Upstream-Status: Pending - +--- deps/Makefile | 1 - deps/lua/Makefile | 1 - deps/lua/src/Makefile | 16 ++++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/deps/Makefile b/deps/Makefile -index 8592e17..1807af5 100644 +index 3bf0363..fd8765a 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -81,7 +81,6 @@ endif +@@ -94,7 +94,6 @@ endif # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more # challenging to cross-compile lua (and redis). These defines make it easier # to fit redis into cross-compilation environments, which typically set AR. diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/oe-use-libc-malloc.patch b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch index 7b601e02a9..7b601e02a9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/oe-use-libc-malloc.patch +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/redis.conf b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf index 75037d6dc8..75037d6dc8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/redis.conf +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/redis.service b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service index b7791d0df4..b7791d0df4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.3/redis.service +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.4.bb index 7fa0e6372a..5d64e9ba78 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.4.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] = "3e2b196d6eb4ddb9e743088bfc2915ccbb42d40f5a8a3edd8cb69c716ec34be7" +SRC_URI[sha256sum] = "8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59" inherit autotools-brokensep pkgconfig update-rc.d systemd useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb index 962d19574c..91b1460ff7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.9.1.bb @@ -11,13 +11,13 @@ SECTION = "utils" LICENSE = "LGPL-2.0-or-later & GPL-2.0-only & GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ file://0001-add-missing-system-header-string.h.patch \ " -SRCREV = "b820c63093c4ae85d7da4f719cf3026d7fca5d09" +SRCREV = "90156f382c2508cc7dc4dc32f8247d3e1291b318" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index 993efab395..ab97356e9b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -1,7 +1,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=72d977d697c3c05830fdff00a7448931" -SRCREV = "beb4650660179963a8ed5b5cbf2085cc1b34f608" -PV = "1.0+git${SRCPV}" +SRCREV = "7626d0a0707391970080d493ce69638719938da7" +PV = "1.0+git" SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" @@ -16,4 +16,4 @@ do_install:append() { install -Dm 644 ${S}/include/uapi/linux/can/isotp.h ${D}${includedir}/linux/can/isotp.h } -EXCLUDE_FROM_WORLD = "1" +SKIP_RECIPE[can-isotp] ?= "Not needed with kernel 5.10+" diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index fc64ec0fcb..596aa260e7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils;branch=master \ file://0001-test-ptts-Set-recv-buffer-size-too-max-to-receive-as.patch \ " SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" -PV = "2.2.0+git${SRCPV}" +PV = "2.2.0+git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb index 3a3dd192be..0b14f9557a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # matches debian/0.5.0-1 tag SRCREV = "44a173195986d0d853316cb02a58785ded66c12b" -PV = "0.5.0+git${SRCPV}" +PV = "0.5.0+git" SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb index a86f4a80d8..8468ff775d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" DEPENDS = "libjpeg-turbo mraa python3-setuptools-native" SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d" -PV = "2.0.0+git${SRCPV}" +PV = "2.0.0+git" SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \ file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb index 84593387d3..1bc4010f8a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/probonopd/zsync-curl;protocol=https;branch=master \ file://make.patch" SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f" -PV = "0.6.2+git${SRCPV}" +PV = "0.6.2+git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/meta-openembedded/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch index d3c26d97ae..2b2baf772e 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch +++ b/meta-openembedded/meta-oe/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch @@ -1,7 +1,7 @@ -From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001 +From 2618ab101f5faaa887c9feeeee84a7d8bc97cbda Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex@linutronix.de> Date: Wed, 16 Nov 2022 11:27:24 +0100 -Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option +Subject: [PATCH] meson.build: correctly handle disabled ssh_agent option Existing code produces these errors: | gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program @@ -10,15 +10,16 @@ Existing code produces these errors: Signed-off-by: Alexander Kanavin <alex@linutronix.de> Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ] + --- - meson.build | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) + meson.build | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 3f35173..11d7fa7 100644 +index dd890a9..1b17b18 100644 --- a/meson.build +++ b/meson.build -@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) +@@ -82,8 +82,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) conf.set('HAVE_MLOCK', cc.has_function('mlock')) conf.set_quoted('GPG_EXECUTABLE', gpg_path) conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) @@ -31,6 +32,3 @@ index 3f35173..11d7fa7 100644 conf.set10('WITH_SYSTEMD', with_systemd) config_file = configure_file( output: 'config.h', --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb b/meta-openembedded/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb index b3438b4e6f..0fd30f7424 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gcr/gcr3_3.41.1.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gcr/gcr3_3.41.2.bb @@ -23,7 +23,7 @@ UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar" SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive" SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch" -SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f" +SRC_URI[archive.sha256sum] = "bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7" S = "${WORKDIR}/gcr-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.0.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb index 83fb234fb3..2d95e14447 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb @@ -11,7 +11,7 @@ SRC_URI = "\ git://github.com/hughsie/libjcat.git;branch=main;protocol=https \ file://run-ptest \ " -SRCREV = "60bb85d53d5da74903ab1e227fbecfa3a3be1b05" +SRCREV = "869e7cf4511b81897512a3f0adb627218e618112" S = "${WORKDIR}/git" inherit gobject-introspection gtk-doc meson ptest-gnome vala lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/aml/aml_git.bb b/meta-openembedded/meta-oe/recipes-graphics/aml/aml_git.bb index eed62adae0..2633e0d215 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/aml/aml_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/aml/aml_git.bb @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/any1/aml;branch=master;protocol=https" SRCREV = "b83f3576ce4187d9285f06e9066ef43a691464d4" -PV = "0.3.0+git${SRCPV}" +PV = "0.3.0+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.5.bb b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb index 1d6ffa3312..50504caf9f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb @@ -3,13 +3,13 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ " -SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=stable-2.x;protocol=https \ file://0001-disable-build-manpages.patch \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-To-fix-error-when-do_package.patch \ " -SRCREV = "d808904fc6082578c02d7c8bf543380ed447e925" +SRCREV = "abbe08b7a487325182758d5285b54437a914207b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_git.bb index 65c9041a3b..247a1fcbb2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fbida/fbida_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo" -PV = "2.14+git${SRCPV}" +PV = "2.14+git" SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \ file://fix-preprocessor.patch \ file://support-jpeg-turbo.patch \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index 3797314b47..dd520b245e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -18,7 +18,7 @@ SRC_URI = " \ file://glmTargets.cmake \ " SRCREV = "efec5db081e3aad807d0731e172ac597f6a39447" -PV .= "+0.9.9.9+git${SRCPV}" +PV .= "+0.9.9.9+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index 113b8666ab..87e7ed4a6b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype " PROVIDES = "virtual/imlib2" -PV = "1.12.1" -SRCREV = "9198db25369f04db069ce61a661c3c47b2622655" +PV = "1.12.2" +SRCREV = "a860e34b19af6b0a73d86ddc0e4829145e18fa6e" inherit autotools pkgconfig lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.2.1.bb b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.2.2.bb index 4c9c64c28a..6621389b5a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libdecor/libdecor_0.2.2.bb @@ -15,7 +15,7 @@ DEPENDS = " \ " S = "${WORKDIR}/git" -SRCREV = "060fe7611aedb5779929e6b1468419c2d4e7168f" +SRCREV = "7807ae3480f5c6a37c5e8505d94af1e764aaf704" PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_0.7.1.bb b/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_0.7.2.bb index 99e63318a1..152409de18 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_0.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_0.7.2.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94fc374e7174f41e3afe0f027ee59ff7" SRC_URI = "git://github.com/any1/neatvnc;branch=v0.7;protocol=https" -SRCREV = "b5b330b22c6a0fdeb718a9e7ee0732cc406863fa" +SRCREV = "14619e6281136a02e376ad23e3cfaedc8de00ffb" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb index efffd962d4..1210af70ea 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb @@ -8,7 +8,7 @@ DEPENDS = " \ startup-notification \ gtk+3 \ " -PV = "2.0.4+git${SRCPV}" +PV = "2.0.4+git" SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39" SRC_URI = " \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb index eff6ad8f83..2ec89bc05b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb @@ -7,7 +7,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=h " # Modify these as desired -PV = "2020.06.15+git${SRCPV}" +PV = "2020.06.15+git" SRCREV = "e1642fb691d29b1462504b58916f7f514a963e80" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.3.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.4.bb index e5310ae25a..b32bf34518 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.4.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 = "e082522c248d3121e466959a8ba4fd4f7ad1a525" +SRCREV = "8ee020e14cf5be4e3f0e9beb09b6b050a1871854" 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/ttf-fonts/ttf-droid_git.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb index 7fa155a22f..f223664905 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.droidfonts.com/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://README.txt;md5=83544262a86f1f1ec761e75897df92bc" SRCREV = "21e6e2de1f0062f949fcc52d0b4559dfa3246e0e" -PV = "0.1+gitr${SRCPV}" +PV = "0.1+git" PR = "r3" SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch index d7000b7da1..f659e36066 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch @@ -13,25 +13,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> framework/platform/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -diff --git a/framework/platform/CMakeLists.txt b/framework/platform/CMakeLists.txt -index c3ac463e4..030163f6c 100644 --- a/framework/platform/CMakeLists.txt +++ b/framework/platform/CMakeLists.txt -@@ -73,8 +73,12 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) +@@ -73,8 +73,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) add_definitions(-DDEQP_SUPPORT_WAYLAND=1) include_directories(lnx/wayland) - pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) -- pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) -+ if (NOT DEFINED WAYLAND_PROTOCOLS_DIR) +- ++ if (NOT WAYLAND_PROTOCOLS_DIR) + pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) + endif() -+ if (NOT DEFINED WAYLAND_SCANNER) -+ pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) -+ endif() - - set(DEQP_XDG_SHELL_PROTOCOL ${WAYLAND_PROTOCOLS_DIR}/stable/xdg-shell/xdg-shell.xml) - set(DEQP_XDG_SHELL_GEN_OUTPUTS_DIR ${PROJECT_BINARY_DIR}/framework/platform) --- -2.37.3 - + if (NOT WAYLAND_SCANNER) + pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) + endif() diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch deleted file mode 100644 index 47d9fc748a..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 74cf53d89529902ecdef5b230421bc4d30fd089b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 25 Jan 2023 15:36:14 -0800 -Subject: [PATCH] include missing <cstdint> - -gcc-13 exposed errors like below due to it removing indirect includes of -these headers in libstdc++ [1] - -../git/external/amber/src/include/amber/shader_info.h:60:15: error: 'uint32_t' was not declared in this scope - 60 | std::vector<uint32_t> shader_data; - | ^~~~~~~~ - -[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html - -Upstream-Status: Submitted [https://github.com/google/amber/pull/1016] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/amber/recipe.h | 1 + - include/amber/shader_info.h | 1 + - src/descriptor_set_and_binding_parser.h | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/include/amber/recipe.h b/include/amber/recipe.h -index 310a86a..1b83213 100644 ---- a/include/amber/recipe.h -+++ b/include/amber/recipe.h -@@ -15,6 +15,7 @@ - #ifndef AMBER_RECIPE_H_ - #define AMBER_RECIPE_H_ - -+#include <cstdint> - #include <string> - #include <utility> - #include <vector> -diff --git a/include/amber/shader_info.h b/include/amber/shader_info.h -index 6c9126a..b5ce751 100644 ---- a/include/amber/shader_info.h -+++ b/include/amber/shader_info.h -@@ -15,6 +15,7 @@ - #ifndef AMBER_SHADER_INFO_H_ - #define AMBER_SHADER_INFO_H_ - -+#include <cstdint> - #include <string> - #include <vector> - -diff --git a/src/descriptor_set_and_binding_parser.h b/src/descriptor_set_and_binding_parser.h -index 145aa42..4b0d774 100644 ---- a/src/descriptor_set_and_binding_parser.h -+++ b/src/descriptor_set_and_binding_parser.h -@@ -15,6 +15,7 @@ - #ifndef SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_ - #define SRC_DESCRIPTOR_SET_AND_BINDING_PARSER_H_ - -+#include <cstdint> - #include <string> - - #include "amber/result.h" --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 72005636ea..09f1fbcaee 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -11,8 +11,7 @@ SRC_URI = "\ git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \ https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;branch=main \ - git://github.com/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \ - file://gen-framework-path.patch \ + git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \ " S = "${WORKDIR}/git" @@ -41,7 +40,7 @@ SRC_URI:append:toolchain-clang = "\ file://fix-clang-private-operator.patch \ " -EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols" +EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON" # The best thing for the user to do is to not specify any of the following # PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its own diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch index b5a1d331ed..b5a1d331ed 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb index 67ce5f2b9d..0656d724b4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb @@ -14,6 +14,10 @@ SRCREV_vulkan-docs = "9a2e576a052a1e65a5d41b593e693ff02745604b" SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" +SRC_URI += "\ + git://github.com/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \ + file://gen-framework-path.patch \ + " S = "${WORKDIR}/git" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch new file mode 100644 index 0000000000..f12abd0c1a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch @@ -0,0 +1,114 @@ +From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 +From: Trevor Woerner <twoerner@gmail.com> +Date: Thu, 23 Sep 2021 19:36:43 -0400 +Subject: [PATCH] use library sonames for linking + +The recommended "best practices" for applications is to link to library +sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This +ensures that applications don't try to use libraries if an incompatible ABI +change occurs. + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] +Signed-off-by: Trevor Woerner <twoerner@gmail.com> +--- + framework/egl/egluGLContextFactory.cpp | 4 ++-- + framework/egl/wrapper/eglwLibrary.cpp | 2 +- + framework/platform/android/tcuAndroidPlatform.cpp | 2 +- + framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- + .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- + framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- + 6 files changed, 9 insertions(+), 9 deletions(-) + +--- a/framework/egl/egluGLContextFactory.cpp ++++ b/framework/egl/egluGLContextFactory.cpp +@@ -63,7 +63,7 @@ using std::vector; + # if (DE_OS == DE_OS_WIN32) + # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" + # else +-# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" + # endif + #endif + +@@ -75,7 +75,7 @@ using std::vector; + # if (DE_OS == DE_OS_WIN32) + # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" + # else +-# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" + # endif + #endif + +--- a/framework/egl/wrapper/eglwLibrary.cpp ++++ b/framework/egl/wrapper/eglwLibrary.cpp +@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) + const char* DefaultLibrary::getLibraryFileName (void) + { + #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) +- return "libEGL.so"; ++ return "libEGL.so.1"; + #elif (DE_OS == DE_OS_WIN32) + return "libEGL.dll"; + #else +--- a/framework/platform/android/tcuAndroidPlatform.cpp ++++ b/framework/platform/android/tcuAndroidPlatform.cpp +@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil + class NativeDisplay : public eglu::NativeDisplay + { + public: +- NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} ++ NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} + virtual ~NativeDisplay (void) {} + + virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } +--- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp ++++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp +@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr + { + public: + Library (void) +- : eglw::DefaultLibrary("libEGL.so") ++ : eglw::DefaultLibrary("libEGL.so.1") + { + } + +--- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp ++++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp +@@ -66,7 +66,7 @@ public: + EGL_PLATFORM_WAYLAND_KHR, + "EGL_KHR_platform_wayland") + , m_display (waylandDisplay) +- , m_library ("libEGL.so") {} ++ , m_library ("libEGL.so.1") {} + + ~Display(void) {} + wayland::Display& getWaylandDisplay (void) { return *m_display; } +--- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp ++++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp +@@ -69,7 +69,7 @@ using std::vector; + + // Default library names + #if !defined(DEQP_GLES2_LIBRARY_PATH) +-# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" + #endif + + #if !defined(DEQP_GLES3_LIBRARY_PATH) +@@ -77,7 +77,7 @@ using std::vector; + #endif + + #if !defined(DEQP_OPENGL_LIBRARY_PATH) +-# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" + #endif + + #if !defined(DEQP_VULKAN_LIBRARY_PATH) +@@ -237,7 +237,7 @@ glu::RenderContext* ContextFactory::crea + } + + EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine, const glu::RenderContext *sharedContext) +- : m_egl("libEGL.so") ++ : m_egl("libEGL.so.1") + , m_contextType(config.type) + , m_eglDisplay(EGL_NO_DISPLAY) + , m_eglContext(EGL_NO_CONTEXT) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb index f491385b33..1008a5fd42 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb @@ -1,24 +1,28 @@ DESCRIPTION = "Vulkan CTS" require khronos-cts.inc -# vulkan-cts-1.3.3.1 -SRCREV_vk-gl-cts = "6024a88390942876147a88dce82bbed73b866c1b" -SRCREV_amber = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed" -SRCREV_glslang = "7dda6a6347b0bd550e202942adee475956ef462a" -SRCREV_spirv-headers = "b765c355f488837ca4c77980ba69484f3ff277f5" -SRCREV_spirv-tools = "b930e734ea198b7aabbbf04ee1562cf6f57962f0" + +SRC_URI += "git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1" + +# vulkan-cts-1.3.7.3 +SRCREV_vk-gl-cts = "d71a36db16d98313c431829432a136dbda692a08" +SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273" +SRCREV_glslang = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3" +SRCREV_spirv-headers = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c" +SRCREV_spirv-tools = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0" SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" -SRCREV_vulkan-docs = "9b5562187a8ad72c171410b036ceedbc450153ba" +SRCREV_vulkan-docs = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" # Not yet needed -SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" -SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" +SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f" +SRCREV_video-parser = "138bbe048221d315962ddf8413aa6a08cc62a381" SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ file://0001-vulkan-cts-include-missing-cstdint.patch \ - file://0001-include-missing-cstdint.patch;patchdir=external/amber/src \ " +TOOLCHAIN = "gcc" + S = "${WORKDIR}/git" REQUIRED_DISTRO_FEATURES = "vulkan" diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index 3633bbc26b..74f80e1844 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/x11vnc.h;endline=31;md5=e871a2ad004776794b616822dcab6314" SRCREV = "87cd0530f438372dda3c70bb491a6fd19f09acc2" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://github.com/LibVNC/x11vnc;branch=master;protocol=https \ file://starting-fix.patch \ diff --git a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb index 317ec19266..b22334fe90 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -2,7 +2,7 @@ SUMMARY = "Inspect and manipulate eBPF programs and maps" DESCRIPTION = "bpftool is a kernel tool for inspection and simple manipulation \ of eBPF programs and maps." LICENSE = "GPL-2.0-only" -DEPENDS = "binutils elfutils" +DEPENDS = "binutils elfutils elfutils-native" PROVIDES = "virtual/bpftool" inherit bash-completion kernelsrc kernel-arch @@ -15,6 +15,7 @@ EXTRA_OEMAKE = "\ O=${B} \ CROSS=${TARGET_PREFIX} \ CC="${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH}" \ + HOSTCC="${BUILD_CC} ${BUILD_CFLAGS}" \ LD="${LD}" \ AR=${AR} \ ARCH=${ARCH} \ 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 6c97e28545..01f185adba 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 @@ -49,6 +49,8 @@ DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" TEST_LIST = "\ ${@bb.utils.filter('PACKAGECONFIG', 'bpf firmware vm', d)} \ rtc \ + ptp \ + timers \ " EXTRA_OEMAKE = '\ CROSS_COMPILE=${TARGET_PREFIX} \ @@ -153,8 +155,8 @@ INHIBIT_PACKAGE_DEBUG_SPLIT="1" FILES:${PN} += "/usr/kernel-selftest" 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 libdir" + +INSANE_SKIP:${PN} += "libdir" SECURITY_CFLAGS = "" COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-corestripper-Fix-uninitialized-warning.patch b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-corestripper-Fix-uninitialized-warning.patch new file mode 100644 index 0000000000..8b90d33e1b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/files/0001-corestripper-Fix-uninitialized-warning.patch @@ -0,0 +1,53 @@ +From bb44bb643cd2a2f937331b4d1a76b03556b718a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 23 Jan 2024 11:36:41 -0800 +Subject: [PATCH] corestripper: Fix uninitialized warning + +Clang finds more open paths where ret can be uninitialized + +Fixes +| ../../../git/src/minicoredumper/corestripper.c:2768:13: error: variable 'ret' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] +| 2768 | } else if (di->core_fd >= 0) { +| | ^~~~~~~~~~~~~~~~ +| ../../../git/src/minicoredumper/corestripper.c:2773:9: note: uninitialized use occurs here +| 2773 | return ret; +| | ^~~ +| ../../../git/src/minicoredumper/corestripper.c:2768:9: note: remove the 'if' if its condition is always true +| 2768 | } else if (di->core_fd >= 0) { +| | ^~~~~~~~~~~~~~~~~~~~~ +| ../../../git/src/minicoredumper/corestripper.c:2763:9: note: initialize the variable 'ret' to silence this warning +| 2763 | int ret; +| | ^ +| | = 0 + +Upstream-Status: Submitted [https://github.com/diamon/minicoredumper/pull/15] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/minicoredumper/corestripper.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c +index 3eb9089..e9e3936 100644 +--- a/src/minicoredumper/corestripper.c ++++ b/src/minicoredumper/corestripper.c +@@ -2707,7 +2707,7 @@ static int dump_data_content_file(struct dump_info *di, + char *tmp_path; + FILE *file; + int len; +- int ret; ++ int ret = -1; + + len = strlen(di->dst_dir) + strlen("/dumps/") + 32 + + strlen(dd->ident) + 1; +@@ -2760,7 +2760,7 @@ out: + static int dump_data_content(struct dump_info *di, struct mcd_dump_data *dd, + const char *symname) + { +- int ret; ++ int ret = -1; + + if (dd->ident) { + /* dump to external file */ +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.6.bb b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb index dfe9f7b51d..726aa60ce7 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.6.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.7.bb @@ -9,12 +9,13 @@ DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig ptest systemd update-rc.d -SRCREV = "da62115c0fab3a4608e4b0ee0c8aa0cf134c14ca" +SRCREV = "ca6e7ad62b4cf984de84aa081024c4e45632cecb" SRC_URI = "git://github.com/diamon/minicoredumper;protocol=https;branch=master \ file://minicoredumper.service \ file://minicoredumper.init \ file://run-ptest \ + file://0001-corestripper-Fix-uninitialized-warning.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb index 76e8f72c4f..bec9b75ebd 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/faad2/faad2_2.11.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=381c8cbe277a7bc1ee2ae6083a04c958" LICENSE_FLAGS = "commercial" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://github.com/knik0/faad2.git;branch=master;protocol=https" SRCREV = "216f00e8ddba6f2c64caf481a04f1ddd78b93e78" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch new file mode 100644 index 0000000000..8411d12caf --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0001-Conceal-imp-warnings-in-Python3.patch @@ -0,0 +1,34 @@ +From f864a2aa29377a77c3aef61ce917cc03d099c430 Mon Sep 17 00:00:00 2001 +From: Thomas Nagy <tnagy@waf.io> +Date: Wed, 14 Aug 2019 22:05:45 +0200 +Subject: [PATCH] Conceal imp warnings in Python3 + +--- +Upstream-Status: Backport [from waflib not jack: https://gitlab.com/ita1024/waf/-/commit/d2060dfd8af4edb5824153ff24e207b39ecd67a2.patch] + + waflib/Context.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/waflib/Context.py b/waflib/Context.py +index 761b521f..38ab03f1 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -6,10 +6,17 @@ + Classes and functions enabling the command system + """ + +-import os, re, imp, sys ++import os, re, sys + from waflib import Utils, Errors, Logs + import waflib.Node + ++if sys.hexversion > 0x3040000: ++ import types ++ class imp(object): ++ new_module = lambda x: types.ModuleType(x) ++else: ++ import imp ++ + # the following 3 constants are updated on each new release (do not touch) + HEXVERSION=0x2000c00 + """Constant updated on new releases""" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch new file mode 100644 index 0000000000..cbced56a67 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack/0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch @@ -0,0 +1,229 @@ +From bcba27168d99a3919b730e6a533cf79ab3b24eee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micka=C3=ABl=20Schoentgen?= <contact@tiger-222.fr> +Date: Sat, 5 Jan 2019 12:02:42 +0100 +Subject: [PATCH] Fix all DeprecationWarning: invalid escape sequence +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr> +--- +Upstream-Status: Backport [from waflib not jack: https://gitlab.com/ita1024/waf/-/commit/412a9b819e86a0061f990c7245f0f5db76d0eda3] + + waflib/Build.py | 2 +- + waflib/ConfigSet.py | 2 +- + waflib/Context.py | 2 +- + waflib/Task.py | 2 +- + waflib/TaskGen.py | 2 +- + waflib/Tools/c_config.py | 2 +- + waflib/Tools/c_preproc.py | 6 +++--- + waflib/Tools/msvc.py | 16 ++++++++-------- + waflib/Utils.py | 2 +- + waflib/ansiterm.py | 2 +- + 10 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/waflib/Build.py b/waflib/Build.py +index c9661df1..9e733c9e 100644 +--- a/waflib/Build.py ++++ b/waflib/Build.py +@@ -104,7 +104,7 @@ class BuildContext(Context.Context): + """Amount of jobs to run in parallel""" + + self.targets = Options.options.targets +- """List of targets to build (default: \*)""" ++ """List of targets to build (default: \\*)""" + + self.keep = Options.options.keep + """Whether the build should continue past errors""" +diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py +index 84736c9c..901fba6c 100644 +--- a/waflib/ConfigSet.py ++++ b/waflib/ConfigSet.py +@@ -11,7 +11,7 @@ The values put in :py:class:`ConfigSet` must be serializable (dicts, lists, stri + + import copy, re, os + from waflib import Logs, Utils +-re_imp = re.compile('^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) ++re_imp = re.compile(r'^(#)*?([^#=]*?)\ =\ (.*?)$', re.M) + + class ConfigSet(object): + """ +diff --git a/waflib/Context.py b/waflib/Context.py +index 38ab03f1..5799a60a 100644 +--- a/waflib/Context.py ++++ b/waflib/Context.py +@@ -614,7 +614,7 @@ class Context(ctx): + Logs.pprint(color, msg) + + def load_special_tools(self, var, ban=[]): +- """ ++ r""" + Loads third-party extensions modules for certain programming languages + by trying to list certain files in the extras/ directory. This method + is typically called once for a programming language group, see for +diff --git a/waflib/Task.py b/waflib/Task.py +index 6aebc607..0c5cb994 100644 +--- a/waflib/Task.py ++++ b/waflib/Task.py +@@ -1044,7 +1044,7 @@ def funex(c): + exec(c, dc) + return dc['f'] + +-re_cond = re.compile('(?P<var>\w+)|(?P<or>\|)|(?P<and>&)') ++re_cond = re.compile(r'(?P<var>\w+)|(?P<or>\|)|(?P<and>&)') + re_novar = re.compile(r'^(SRC|TGT)\W+.*?$') + reg_act = re.compile(r'(?P<backslash>\\)|(?P<dollar>\$\$)|(?P<subst>\$\{(?P<var>\w+)(?P<code>.*?)\})', re.M) + def compile_fun_shell(line): +diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py +index a74e6431..3776bac1 100644 +--- a/waflib/TaskGen.py ++++ b/waflib/TaskGen.py +@@ -727,7 +727,7 @@ def sequence_order(self): + self.bld.prev = self + + +-re_m4 = re.compile('@(\w+)@', re.M) ++re_m4 = re.compile(r'@(\w+)@', re.M) + + class subst_pc(Task.Task): + """ +diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py +index d2b3c0d8..60cc0ecd 100644 +--- a/waflib/Tools/c_config.py ++++ b/waflib/Tools/c_config.py +@@ -239,7 +239,7 @@ def validate_cfg(self, kw): + + @conf + def exec_cfg(self, kw): +- """ ++ r""" + Executes ``pkg-config`` or other ``-config`` applications to collect configuration flags: + + * if atleast_pkgconfig_version is given, check that pkg-config has the version n and return +diff --git a/waflib/Tools/c_preproc.py b/waflib/Tools/c_preproc.py +index 7e04b4a7..68e5f5ae 100644 +--- a/waflib/Tools/c_preproc.py ++++ b/waflib/Tools/c_preproc.py +@@ -75,13 +75,13 @@ re_lines = re.compile( + re.IGNORECASE | re.MULTILINE) + """Match #include lines""" + +-re_mac = re.compile("^[a-zA-Z_]\w*") ++re_mac = re.compile(r"^[a-zA-Z_]\w*") + """Match macro definitions""" + + re_fun = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*[(]') + """Match macro functions""" + +-re_pragma_once = re.compile('^\s*once\s*', re.IGNORECASE) ++re_pragma_once = re.compile(r'^\s*once\s*', re.IGNORECASE) + """Match #pragma once statements""" + + re_nl = re.compile('\\\\\r*\n', re.MULTILINE) +@@ -660,7 +660,7 @@ def extract_macro(txt): + # empty define, assign an empty token + return (v, [[], [('T','')]]) + +-re_include = re.compile('^\s*(<(?:.*)>|"(?:.*)")') ++re_include = re.compile(r'^\s*(<(?:.*)>|"(?:.*)")') + def extract_include(txt, defs): + """ + Process a line in the form:: +diff --git a/waflib/Tools/msvc.py b/waflib/Tools/msvc.py +index 17b347d4..ff58449d 100644 +--- a/waflib/Tools/msvc.py ++++ b/waflib/Tools/msvc.py +@@ -281,7 +281,7 @@ def gather_wince_supported_platforms(): + + def gather_msvc_detected_versions(): + #Detected MSVC versions! +- version_pattern = re.compile('^(\d\d?\.\d\d?)(Exp)?$') ++ version_pattern = re.compile(r'^(\d\d?\.\d\d?)(Exp)?$') + detected_versions = [] + for vcver,vcvar in (('VCExpress','Exp'), ('VisualStudio','')): + prefix = 'SOFTWARE\\Wow6432node\\Microsoft\\' + vcver +@@ -367,7 +367,7 @@ def gather_wsdk_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^v..?.?\...?.?') ++ version_pattern = re.compile(r'^v..?.?\...?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Microsoft\\Microsoft SDKs\\Windows') + except OSError: +@@ -525,7 +525,7 @@ def gather_icl_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\....?.?') ++ version_pattern = re.compile(r'^...?.?\....?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Compilers\\C++') + except OSError: +@@ -579,7 +579,7 @@ def gather_intel_composer_versions(conf, versions): + :param versions: list to modify + :type versions: list + """ +- version_pattern = re.compile('^...?.?\...?.?.?') ++ version_pattern = re.compile(r'^...?.?\...?.?.?') + try: + all_versions = Utils.winreg.OpenKey(Utils.winreg.HKEY_LOCAL_MACHINE, 'SOFTWARE\\Wow6432node\\Intel\\Suites') + except OSError: +@@ -683,7 +683,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + if not is_static and ltdict.get('library_names', ''): + dllnames=ltdict['library_names'].split() + dll=dllnames[0].lower() +- dll=re.sub('\.dll$', '', dll) ++ dll=re.sub(r'\.dll$', '', dll) + return (lt_libdir, dll, False) + elif ltdict.get('old_library', ''): + olib=ltdict['old_library'] +@@ -700,7 +700,7 @@ def find_lt_names_msvc(self, libname, is_static=False): + @conf + def libname_msvc(self, libname, is_static=False): + lib = libname.lower() +- lib = re.sub('\.lib$','',lib) ++ lib = re.sub(r'\.lib$','',lib) + + if lib in g_msvc_systemlibs: + return lib +@@ -747,11 +747,11 @@ def libname_msvc(self, libname, is_static=False): + for libn in libnames: + if os.path.exists(os.path.join(path, libn)): + Logs.debug('msvc: lib found: %s', os.path.join(path,libn)) +- return re.sub('\.lib$', '',libn) ++ return re.sub(r'\.lib$', '',libn) + + #if no lib can be found, just return the libname as msvc expects it + self.fatal('The library %r could not be found' % libname) +- return re.sub('\.lib$', '', libname) ++ return re.sub(r'\.lib$', '', libname) + + @conf + def check_lib_msvc(self, libname, is_static=False, uselib_store=None): +diff --git a/waflib/Utils.py b/waflib/Utils.py +index a0cc2a09..da1b73e7 100644 +--- a/waflib/Utils.py ++++ b/waflib/Utils.py +@@ -730,7 +730,7 @@ def unversioned_sys_platform(): + if s == 'cli' and os.name == 'nt': + # ironpython is only on windows as far as we know + return 'win32' +- return re.split('\d+$', s)[0] ++ return re.split(r'\d+$', s)[0] + + def nada(*k, **kw): + """ +diff --git a/waflib/ansiterm.py b/waflib/ansiterm.py +index 0d20c637..027f0ad6 100644 +--- a/waflib/ansiterm.py ++++ b/waflib/ansiterm.py +@@ -264,7 +264,7 @@ else: + 'u': pop_cursor, + } + # Match either the escape sequence or text not containing escape sequence +- ansi_tokens = re.compile('(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') ++ ansi_tokens = re.compile(r'(?:\x1b\[([0-9?;]*)([a-zA-Z])|([^\x1b]+))') + def write(self, text): + try: + wlock.acquire() diff --git a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb index b5c52a6edc..bb844e4ff1 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/jack/jack_1.9.22.bb @@ -16,7 +16,10 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libsamplerate0 libsndfile1" -SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https" +SRC_URI = "git://github.com/jackaudio/jack2.git;branch=master;protocol=https \ + file://0001-Conceal-imp-warnings-in-Python3.patch \ + file://0002-Fix-all-DeprecationWarning-invalid-escape-sequence.patch \ +" SRCREV = "4f58969432339a250ce87fe855fb962c67d00ddb" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb index 594b51b439..52759ef18e 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb @@ -32,7 +32,7 @@ SRC_URI = "\ SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" -PV .= "+git${SRCPV}" +PV .= "+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch index e0fd4fea1b..463651aa4a 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch @@ -1,21 +1,20 @@ -From dc0a5c3d2dd4e79d12a150a246a95c4dc88326f1 Mon Sep 17 00:00:00 2001 +From 2829e6998b7595dd2108c1497fdd02485ef99e2c Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Tue, 16 Aug 2011 16:04:35 +0200 Subject: [PATCH] Upstream: not yet Fix configure to accept "--prefix=" (a blank prefix). ---- Upstream-Status: Pending - +--- build/make/configure.sh | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/build/make/configure.sh b/build/make/configure.sh -index 007e020..04d5cbf 100644 +index b645a666f..0b99a8b38 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -581,6 +581,8 @@ process_common_cmdline() { +@@ -658,6 +658,8 @@ process_common_cmdline() { ;; --prefix=*) prefix="${optval}" @@ -24,7 +23,7 @@ index 007e020..04d5cbf 100644 ;; --libdir=*) libdir="${optval}" -@@ -614,13 +616,23 @@ process_cmdline() { +@@ -687,13 +689,23 @@ process_cmdline() { } post_process_common_cmdline() { diff --git a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb index 1354e2eb98..b4d49842ea 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.13.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/webm/libvpx_1.14.0.bb @@ -7,7 +7,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4" -SRCREV = "10b9492dcf05b652e2e4b370e205bd605d421972" +SRCREV = "602e2e8979d111b02c959470da5322797dd96a19" 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/geos/geos_3.12.0.bb b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.12.1.bb index 0382e6bdfe..461652a5ad 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.12.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/geos/geos_3.12.1.bb @@ -6,7 +6,7 @@ LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2" -SRC_URI[sha256sum] = "d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39" +SRC_URI[sha256sum] = "d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03" inherit cmake pkgconfig binconfig diff --git a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.3.0.bb b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.3.1.bb index 59bded87f5..78f4287d63 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/proj/proj_9.3.1.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] = "91a3695a004ea28db0448a34460bed4cc3b130e5c7d74339ec999efdab0e547d" +SRC_URI[sha256sum] = "b0f919cb9e1f42f803a3e616c2b63a78e4d81ecfaed80978d570d3a5e29d10bc" inherit cmake lib_package @@ -23,3 +23,5 @@ PACKAGECONFIG[apps] = "-DBUILD_APPS=ON, -DBUILD_APPS=OFF" PACKAGECONFIG[curl] = "-DENABLE_CURL=ON,-DENABLE_CURL=OFF,curl" PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," PACKAGECONFIG[tiff] = "-DENABLE_TIFF=ON,-DENABLE_TIFF=OFF,tiff" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb index 92655e3c6f..a13c9a023a 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.8.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" -SRCREV = "986d2485784d57d7a84cc5af50e67bde827b0dc9" +SRCREV = "452e1f5c20ec6adf62cd296cb9dddacbc06e6ffa" inherit cmake pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb index 746d4182a9..6d64ab71bf 100644 --- a/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=794d11c5219c59c9efa2487c2b4066b2" SRC_URI = "git://github.com/ajaxorg/ace-builds.git;protocol=https;branch=master" -PV = "02.07.17+git${SRCPV}" +PV = "02.07.17+git" SRCREV = "812e2c56aed246931a667f16c28b096e34597016" FILES:${PN} = "${datadir}/ace-builds" diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.4.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb index f02c457284..a5a7a63657 100644 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" DEPENDS = "libatomic-ops" -SRCREV = "d1ff06cc503a74dca0150d5e988f2c93158b0cdf" +SRCREV = "e340b2e869e02718de9c9d7fa440ef4b35785388" SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/btop/btop_1.2.13.bb b/meta-openembedded/meta-oe/recipes-support/btop/btop_1.3.0.bb index a944fe7b51..f20d1a8ec4 100644 --- a/meta-openembedded/meta-oe/recipes-support/btop/btop_1.2.13.bb +++ b/meta-openembedded/meta-oe/recipes-support/btop/btop_1.3.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "console/utils" SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main" -SRCREV = "9edbf27f1b6d5844a97325fcda732762ba086a99" +SRCREV = "36842a3bccfb78f5c27642435bff387b42f7d13b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.24.0.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.26.0.bb index 3b3b2b83fe..450d466f49 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.24.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.26.0.bb @@ -5,9 +5,9 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" -SRC_URI = "https://c-ares.org/download/c-ares-1.24.0.tar.gz \ +SRC_URI = "https://c-ares.org/download/${BPN}-${PV}.tar.gz \ file://run-ptest" -SRC_URI[sha256sum] = "c517de6d5ac9cd55a9b72c1541c3e25b84588421817b5f092850ac09a8df5103" +SRC_URI[sha256sum] = "bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50" PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[manpages] = "" diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch index 46d30e8c16..e39e7ddd3d 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid/0001-Add-build-rule-for-README.patch @@ -1,24 +1,24 @@ +From c82680a21c7411ba63e5815786eeb471720faa29 Mon Sep 17 00:00:00 2001 +From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +Date: Wed, 6 Nov 2019 20:10:09 +0800 Subject: [PATCH] Add build rule for README. fix do_configure error: Makefile.am: required file `./README' not found -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- Upstream-Status: Pending +Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> +--- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am -index 49574a3..a5a7c2a 100644 +index e77c4c4..fd77ecd 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -26,3 +26,4 @@ libtool: $(LIBTOOL_DEPS) +@@ -27,3 +27,4 @@ libtool: $(LIBTOOL_DEPS) ChangeLog: git log --stat --decorate=short > $@ +README: README.md --- -2.7.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.5.4.bb b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.5.5.bb index e53ffa40b3..e76881916e 100644 --- a/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.5.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/ccid/ccid_1.5.5.bb @@ -10,7 +10,7 @@ SRC_URI = "https://ccid.apdu.fr/files/ccid-${PV}.tar.bz2 \ file://0001-Add-build-rule-for-README.patch \ " -SRC_URI[sha256sum] = "6e832adc172ecdcfdee2b56f33144684882cbe972daff1938e7a9c73a64f88bf" +SRC_URI[sha256sum] = "194708f75fe369d45dd7c15e8b3e8a7db8b49cfc5557574ca2a2e76ef12ca0ca" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_2.3.2.bb b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_2.3.2.bb index 7c6b2547cb..ef3c951bbf 100644 --- a/meta-openembedded/meta-oe/recipes-support/cli11/cli11_2.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/cli11/cli11_2.3.2.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/CLIUtils/CLI11" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=afb20fe5f67e21074b10b864d9563c11" SRCREV = "291c58789c031208f08f4f261a858b5b7083e8e2" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \ https://github.com/philsquared/Catch/releases/download/v2.13.7/catch.hpp \ diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.3.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.31.0.bb index 6697dfe07f..ce8b4cd493 100644 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.31.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" -SRCREV = "5ba25ff40eba44c811f79ab6a792baf945b8307c" +SRCREV = "8fbf029685482827828b5858444157052f1b0a5f" S = "${WORKDIR}/git" inherit cmake lib_package 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 48b52eefca..bb8c9de71d 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 @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" -PV = "0.0+git${SRCPV}" +PV = "0.0+git" S = "${WORKDIR}/git" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb b/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb index 4501b082de..491f10dda0 100644 --- a/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb @@ -11,7 +11,7 @@ SRCREV = "86a5627dbeac8d9d9bc34326a758d6a477e876e4" SRC_URI = "git://git@gitlab.freedesktop.org/libevdev/evemu.git;protocol=https;branch=master" S = "${WORKDIR}/git" -PV = "gitr${SRCPV}" +PV = "2.7.0+git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.4.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.4.bb index 2748b84f7c..98d05f6e25 100644 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://naios.github.io/function2" LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRCREV = "a354bd093d2b6e50c9325dbce84d20b4e77aabc6" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch index d85aa15637..3d113efa15 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch +++ b/meta-openembedded/meta-oe/recipes-support/htop/files/0001-Use-pkg-config.patch @@ -1,4 +1,4 @@ -From 98ed72177c49a8015a443b3ec272fee3fb5a4eb3 Mon Sep 17 00:00:00 2001 +From 0d49ee6416e389b9a7ba693588c2eaf129306a01 Mon Sep 17 00:00:00 2001 From: Paul Barker <pbarker@toganlabs.com> Date: Sun, 5 Nov 2017 22:07:30 +0000 Subject: [PATCH] htop: Update to v2.0.2 @@ -16,10 +16,10 @@ Upstream-Status: Inappropriate [`ncurses*-config` can be used outside of OpenEmb 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 0e69096..d20014f 100644 +index e4df238a..2a31b201 100644 --- a/configure.ac +++ b/configure.ac -@@ -322,10 +322,10 @@ AC_ARG_ENABLE([unicode], +@@ -391,10 +391,10 @@ AC_ARG_ENABLE([unicode], [], [enable_unicode=yes]) if test "x$enable_unicode" = xyes; then @@ -34,7 +34,7 @@ index 0e69096..d20014f 100644 HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], -@@ -342,8 +342,8 @@ if test "x$enable_unicode" = xyes; then +@@ -416,8 +416,8 @@ if test "x$enable_unicode" = xyes; then # (at this point we already link against a working ncurses library with wide character support) AC_SEARCH_LIBS([keypad], [tinfow tinfo]) else diff --git a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.2.2.bb b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.3.0.bb index 68d4a3f8f4..cd5b766f0f 100644 --- a/meta-openembedded/meta-oe/recipes-support/htop/htop_3.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/htop/htop_3.3.0.bb @@ -9,7 +9,7 @@ DEPENDS = "ncurses" SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \ file://0001-Use-pkg-config.patch \ " -SRCREV = "55c10eccd71b6b016a50237bc8c8508b7bf66783" +SRCREV = "68c970c7ef4a0682760ed570b3d82388ae7ccf54" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index 047acf28db..0ec426afb9 100644 --- a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb @@ -133,7 +133,7 @@ LIC_FILES_CHKSUM = " \ RDEPENDS:${PN} = "hunspell" -PV = "0.0.0+git${SRCPV}" +PV = "0.0.0+git" SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.377.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.379.bb index dea819e44f..50d449ee5d 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.377.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.379.bb @@ -5,7 +5,7 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "7c46440af001d0bc8230b6f009b73a25b614e032" +SRCREV = "87db4fd0620270614f5079c5f73b1fb6000ca081" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb index 3dbd8db63f..8218b08084 100644 --- a/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" DEPENDS = "libirecovery libimobiledevice libzip curl libimobiledevice-glue openssl" -PV = "1.0.1+git${SRCPV}" +PV = "1.0.1+git" SRCREV = "ecae6c6e8ca6b6bad080a1c73f10ffd0e67d75a7" SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb index e01c0897bb..017e7d26a6 100644 --- a/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa" -PV = "1.5+git${SRCPV}" +PV = "1.5+git" SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ file://fix-configure-option-parsing.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/inih/libinih_57.bb b/meta-openembedded/meta-oe/recipes-support/inih/libinih_58.bb index 08957e18fb..2bcf2b4bd4 100644 --- a/meta-openembedded/meta-oe/recipes-support/inih/libinih_57.bb +++ b/meta-openembedded/meta-oe/recipes-support/inih/libinih_58.bb @@ -9,6 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202" SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" S = "${WORKDIR}/git" -SRCREV = "9cecf0643da0846e77f64d10a126d9f48b9e05e8" +SRCREV = "5cc5e2c24642513aaa5b19126aad42d0e4e0923e" inherit meson pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.1.bb b/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.1.bb index 5e42cdcb06..c80668d279 100644 --- a/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e02baf71c76e0650e667d7da133379ac" DEPENDS = "doxygen-native" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \ file://0001-iniparser.pc-Make-libpath-a-variable.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb b/meta-openembedded/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb index 6a1e7b75e1..e0683b177b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/libb64" LICENSE = "PD" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=81296a564fa0621472714aae7c763d96" -PV .= "+2.0.0.2+git${SRCPV}" +PV .= "+2.0.0.2+git" SRCREV = "ce864b17ea0e24a91e77c7dd3eb2d1ac4175b3f0" SRC_URI = "git://github.com/libb64/libb64;protocol=https;branch=master \ diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index c5f26ecb4e..6ad20d6370 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -16,7 +16,7 @@ DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'boost', '', d)} " PROVIDES += "${PN}-dev" -PV .= "+git${SRCPV}" +PV .= "+git" SRCREV = "ebef1e929807629befafbb2918ea1a08c7194554" SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ @@ -29,6 +29,8 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig ptest +CXXFLAGS:append:toolchain-clang = " -Wno-error=c++11-narrowing-const-reference" + LIBATOMIC:mips = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" LIBATOMIC:riscv32 = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" LIBATOMIC:powerpc = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb index a69194996b..dd7f457b10 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb @@ -5,7 +5,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING.LESSER.txt;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libusb udev" -PV = "1.0.0+git${SRCPV}" +PV = "1.0.0+git" SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \ diff --git a/meta-openembedded/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-openembedded/meta-oe/recipes-support/libfann/libfann_git.bb index 2f52a0f3bd..40f91ac43d 100644 --- a/meta-openembedded/meta-oe/recipes-support/libfann/libfann_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libfann/libfann_git.bb @@ -12,7 +12,7 @@ SRCREV ?= "7ec1fc7e5bd734f1d3c89b095e630e83c86b9be1" SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \ " -PV = "2.2.0+git${SRCPV}" +PV = "2.2.0+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.7.1.bb b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.8.bb index 985fd7c55c..3894facecb 100644 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.8.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c" -SRCREV = "13ba38387e5446849ae59d3ccd8183cf9aca3145" +SRCREV = "bff7dda7e2a0f883d0b89e23fed725c916de3e61" SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb index ca6f9ba3fa..68d917ffe9 100644 --- a/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb @@ -27,8 +27,8 @@ GIR_MESON_DISABLE_FLAG = 'disabled' GTKDOC_MESON_OPTION = "enable-gtk-doc" EXTRA_OEMESON += " \ - -Dwith-pci-ids-path=${datadir}/pci.ids \ - -Dwith-usb-ids-path=${datadir}/usb.ids \ + -Dwith-pci-ids-path=${datadir}/hwdata/pci.ids \ + -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \ " -RDEPENDS:${PN} = "pciutils-ids usbids" +RDEPENDS:${PN} = "hwdata" diff --git a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 5b1d021e36..822b7ffc2b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -21,7 +21,8 @@ ALTERNATIVE_PRIORITY = "50" ALTERNATIVE:${PN}-yang = "ietf-interfaces " ALTERNATIVE_LINK_NAME[ietf-interfaces] = "${datadir}/yang/ietf-interfaces.yang" -EXTRA_OECONF = "ac_cv_path_SH=/bin/sh" +EXTRA_OECONF:class-native = "ac_cv_path_SH=/bin/sh" +EXTRA_OECONF:class-target = "ac_cv_path_SH=/bin/sh ac_cv_path_WGET=${bindir}/wget ac_cv_path_AWK=${bindir}/awk" do_install:append () { install -d ${D}${sysconfdir} diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb index cece68c632..1c94eff246 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb @@ -1,5 +1,5 @@ SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" +HOMEPAGE = "https://leethomason.github.io/tinyxml2" SECTION = "libs" LICENSE = "Zlib" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" @@ -12,7 +12,10 @@ S = "${WORKDIR}/git" inherit meson ptest -EXTRA_OEMESON += "${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true', '', d)}" +EXTRA_OEMESON += " \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true', '', d)} \ + -Ddefault_library=both \ +" CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" diff --git a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch index 1ab3494e18..24a2760d11 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch @@ -1,4 +1,4 @@ -From fc7855891c66599487265701294963bb0772bb80 Mon Sep 17 00:00:00 2001 +From 421b366cafdf954b7e1cd2bbb78b55e04d73c082 Mon Sep 17 00:00:00 2001 From: Wlodzimierz Lipert <wlodzimierz.lipert@gmail.com> Date: Mon, 28 Nov 2022 08:29:54 +0100 Subject: [PATCH] fix: stack-buffer-overflow in usbg_f_foo_attr_val processing. @@ -386,11 +386,11 @@ index b0409f1..06cee30 100644 #ifdef __cplusplus diff --git a/include/usbg/function/uac2.h b/include/usbg/function/uac2.h -index c1bbb14..1ea55dc 100644 +index 6fc4d24..80918ef 100644 --- a/include/usbg/function/uac2.h +++ b/include/usbg/function/uac2.h -@@ -53,9 +53,6 @@ union usbg_f_uac2_attr_val { - int p_ssize; +@@ -110,9 +110,6 @@ union usbg_f_uac2_attr_val { + const char * function_name; }; -#define USBG_F_UAC2_INT_TO_ATTR_VAL(WHAT) \ @@ -399,7 +399,7 @@ index c1bbb14..1ea55dc 100644 /** * @brief Cast from generic function to uac2 function * @param[in] f function to be converted to uac2 funciton. -@@ -115,7 +112,7 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +@@ -172,7 +169,7 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, * @return 0 on success usbg_error if error occurred. */ int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, @@ -408,7 +408,7 @@ index c1bbb14..1ea55dc 100644 /** * @brief Get the capture channel mask of UAC2 adapter -@@ -137,8 +134,8 @@ static inline int usbg_f_uac2_get_c_chmask(usbg_f_uac2 *af, int *c_chmask) +@@ -194,8 +191,8 @@ static inline int usbg_f_uac2_get_c_chmask(usbg_f_uac2 *af, int *c_chmask) */ static inline int usbg_f_uac2_set_c_chmask(usbg_f_uac2 *af, int c_chmask) { @@ -419,7 +419,7 @@ index c1bbb14..1ea55dc 100644 } /** -@@ -161,8 +158,8 @@ static inline int usbg_f_uac2_get_c_srate(usbg_f_uac2 *af, int *c_srate) +@@ -218,8 +215,8 @@ static inline int usbg_f_uac2_get_c_srate(usbg_f_uac2 *af, int *c_srate) */ static inline int usbg_f_uac2_set_c_srate(usbg_f_uac2 *af, int c_srate) { @@ -430,7 +430,7 @@ index c1bbb14..1ea55dc 100644 } /** -@@ -185,8 +182,8 @@ static inline int usbg_f_uac2_get_c_ssize(usbg_f_uac2 *af, int *c_ssize) +@@ -242,8 +239,8 @@ static inline int usbg_f_uac2_get_c_ssize(usbg_f_uac2 *af, int *c_ssize) */ static inline int usbg_f_uac2_set_c_ssize(usbg_f_uac2 *af, int c_ssize) { @@ -441,7 +441,7 @@ index c1bbb14..1ea55dc 100644 } /** -@@ -209,8 +206,8 @@ static inline int usbg_f_uac2_get_p_chmask(usbg_f_uac2 *af, int *p_chmask) +@@ -266,8 +263,8 @@ static inline int usbg_f_uac2_get_p_chmask(usbg_f_uac2 *af, int *p_chmask) */ static inline int usbg_f_uac2_set_p_chmask(usbg_f_uac2 *af, int p_chmask) { @@ -452,7 +452,7 @@ index c1bbb14..1ea55dc 100644 } /** -@@ -233,8 +230,8 @@ static inline int usbg_f_uac2_get_p_srate(usbg_f_uac2 *af, int *p_srate) +@@ -290,8 +287,8 @@ static inline int usbg_f_uac2_get_p_srate(usbg_f_uac2 *af, int *p_srate) */ static inline int usbg_f_uac2_set_p_srate(usbg_f_uac2 *af, int p_srate) { @@ -463,7 +463,7 @@ index c1bbb14..1ea55dc 100644 } /** -@@ -257,8 +254,8 @@ static inline int usbg_f_uac2_get_p_ssize(usbg_f_uac2 *af, int *p_ssize) +@@ -314,8 +311,8 @@ static inline int usbg_f_uac2_get_p_ssize(usbg_f_uac2 *af, int *p_ssize) */ static inline int usbg_f_uac2_set_p_ssize(usbg_f_uac2 *af, int p_ssize) { @@ -536,7 +536,7 @@ index 634209f..ac97bc8 100644 libusbgx_la_CFLAGS = $(LIBCONFIG_CFLAGS) AM_CPPFLAGS=-I$(top_srcdir)/include/ -I$(top_builddir)/include/usbg diff --git a/src/function/ether.c b/src/function/ether.c -index ab91af9..d7dcd5d 100644 +index a9eaf33..a1d20f1 100644 --- a/src/function/ether.c +++ b/src/function/ether.c @@ -124,7 +124,7 @@ static int ether_libconfig_import(struct usbg_function *f, @@ -702,10 +702,10 @@ index 519b012..5cdd814 100644 int usbg_f_ms_get_lun_file_s(usbg_f_ms *mf, int lun_id, diff --git a/src/function/uac2.c b/src/function/uac2.c -index f2c1a49..38a9b0f 100644 +index 9ca8b66..fc06c1d 100644 --- a/src/function/uac2.c +++ b/src/function/uac2.c -@@ -89,7 +89,7 @@ static int uac2_libconfig_import(struct usbg_function *f, +@@ -125,7 +125,7 @@ static int uac2_libconfig_import(struct usbg_function *f, if (ret < 0) break; @@ -714,7 +714,7 @@ index f2c1a49..38a9b0f 100644 if (ret) break; } -@@ -174,8 +174,8 @@ int usbg_f_uac2_set_attrs(usbg_f_uac2 *af, +@@ -210,8 +210,8 @@ int usbg_f_uac2_set_attrs(usbg_f_uac2 *af, for (i = USBG_F_UAC2_ATTR_MIN; i < USBG_F_UAC2_ATTR_MAX; ++i) { ret = usbg_f_uac2_set_attr_val(af, i, @@ -725,7 +725,7 @@ index f2c1a49..38a9b0f 100644 + uac2_attr[i].offset)); if (ret) break; -@@ -193,8 +193,8 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, +@@ -229,8 +229,8 @@ int usbg_f_uac2_get_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, } int usbg_f_uac2_set_attr_val(usbg_f_uac2 *af, enum usbg_f_uac2_attr attr, @@ -792,5 +792,5 @@ index 5f7f4e5..7234649 100644 char str_addr[USBG_MAX_STR_LENGTH]; -- -2.25.1 +2.42.0 diff --git a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop new file mode 100755 index 0000000000..24b7caed5e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/gadget-stop @@ -0,0 +1,13 @@ +#!/bin/sh + +[ -r /etc/default/usbgx ] && . /etc/default/usbgx + +for i in $IMPORT_SCHEMAS; do + if [ -e /sys/kernel/config/usb_gadget/"$i"/idVendor ]; then + if [ -e /sys/kernel/config/usb_gadget/"$i"/idProduct ]; then + idVendor=$(cat /sys/kernel/config/usb_gadget/"$i"/idVendor) + idProduct=$(cat /sys/kernel/config/usb_gadget/"$i"/idProduct) + /usr/bin/gadget-vid-pid-remove ${idVendor}:${idProduct} + fi + fi +done diff --git a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service index d7d394cfe1..7210969d62 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx/usbgx.service @@ -5,7 +5,9 @@ After=sys-kernel-config.mount [Service] Type=oneshot +RemainAfterExit=yes ExecStart=/usr/bin/gadget-start +ExecStop=/usr/bin/gadget-stop [Install] WantedBy=usb-gadget.target diff --git a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb index 7998b0c155..a20ff4eeab 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx_git.bb @@ -5,14 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ inherit autotools pkgconfig systemd update-rc.d update-alternatives -PV = "0.2.0+git${SRCPV}" -SRCREV = "721e3a1cbd7e2b6361bb439d3959e7403e4f0092" +PV = "0.2.0+git" +SRCREV = "ec0b01c03fdc7893997b7b32ec1c12c6103f62f3" SRCBRANCH = "master" SRC_URI = " \ git://github.com/libusbgx/libusbgx.git;branch=${SRCBRANCH};protocol=https \ file://0001-libusbgx-Add-interface-name-for-NCM-Feature-Descript.patch \ file://0001-fix-stack-buffer-overflow-in-usbg_f_foo_attr_val-pro.patch \ file://gadget-start \ + file://gadget-stop \ file://usbgx.initd \ file://usbgx.service \ " @@ -39,6 +40,8 @@ INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', ' do_install:append() { install -Dm 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-start sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start + install -m 0755 ${WORKDIR}/gadget-start ${D}${bindir}/gadget-stop + sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -Dm 0644 ${WORKDIR}/usbgx.service ${D}${systemd_system_unitdir}/usbgx.service diff --git a/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb index 48be8dfa96..844e5acf90 100644 --- a/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df" -PV = "4.1+git${SRCPV}" +PV = "4.1+git" SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \ file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/lzop/lzop/acinclude.m4 b/meta-openembedded/meta-oe/recipes-support/lzop/lzop/acinclude.m4 deleted file mode 100644 index 0029c19c7d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/lzop/lzop/acinclude.m4 +++ /dev/null @@ -1,390 +0,0 @@ - -AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [ -AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])]) -])# - -AC_DEFUN([mfx_ACC_CHECK_HEADERS], [ -AC_HEADER_TIME -AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/stat.h sys/time.h sys/types.h sys/wait.h]) -])# - -AC_DEFUN([mfx_ACC_CHECK_FUNCS], [ -AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown ctime difftime fstat gettimeofday gmtime localtime longjmp lstat memcmp memcpy memmove memset mktime qsort raise setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf) -])# - - -AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [ -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) - -AC_CHECK_SIZEOF(long long) -AC_CHECK_SIZEOF(__int16) -AC_CHECK_SIZEOF(__int32) -AC_CHECK_SIZEOF(__int64) - -AC_CHECK_SIZEOF(void *) -AC_CHECK_SIZEOF(size_t) -AC_CHECK_SIZEOF(ptrdiff_t) -])# - - -# /*********************************************************************** -# // Check for ACC_conformance -# ************************************************************************/ - -AC_DEFUN([mfx_ACC_ACCCHK], [ -mfx_tmp=$1 -mfx_save_CPPFLAGS=$CPPFLAGS -dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here -test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS" - -AC_MSG_CHECKING([whether your compiler passes the ACC conformance test]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#define ACC_CONFIG_NO_HEADER 1 -#include "acc/acc.h" -#include "acc/acc_incd.h" -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr) -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -static void test_acc_compile_time_assert(void) { -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr) -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -} -#undef NDEBUG -#include <assert.h> -static int test_acc_run_time_assert(int r) { -#define ACCCHK_ASSERT(expr) assert(expr); -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -return r; -} -]], [[ -test_acc_compile_time_assert(); -if (test_acc_run_time_assert(1) != 1) return 1; -]] -)]) - -mfx_tmp=FAILED -_AC_COMPILE_IFELSE([], [mfx_tmp=yes]) -rm -f conftest.$ac_ext conftest.$ac_objext - -CPPFLAGS=$mfx_save_CPPFLAGS - -AC_MSG_RESULT([$mfx_tmp]) -case x$mfx_tmp in - xpassed | xyes) ;; - *) - AC_MSG_NOTICE([]) - AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ]) - AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending]) - AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.]) - AC_MSG_NOTICE([Thanks for your support.]) - AC_MSG_NOTICE([]) - AC_MSG_ERROR([ACC conformance test failed. Stop.]) -dnl AS_EXIT - ;; -esac -])# mfx_ACC_ACCCHK - - -# /*********************************************************************** -# // Check for ACC_conformance -# ************************************************************************/ - -AC_DEFUN([mfx_MINIACC_ACCCHK], [ -mfx_tmp=$1 -mfx_save_CPPFLAGS=$CPPFLAGS -dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here -test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS" - -AC_MSG_CHECKING([whether your compiler passes the ACC conformance test]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#define ACC_CONFIG_NO_HEADER 1 -#define ACC_WANT_ACC_INCD_H 1 -#include $2 - -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr) -#include $2 - -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr) -static void test_acc_compile_time_assert(void) { -#include $2 -} - -#undef NDEBUG -#include <assert.h> -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) assert(expr); -static int test_acc_run_time_assert(int r) { -#include $2 -return r; -} -]], [[ -test_acc_compile_time_assert(); -if (test_acc_run_time_assert(1) != 1) return 1; -]] -)]) - -mfx_tmp=FAILED -_AC_COMPILE_IFELSE([], [mfx_tmp=yes]) -rm -f conftest.$ac_ext conftest.$ac_objext - -CPPFLAGS=$mfx_save_CPPFLAGS - -AC_MSG_RESULT([$mfx_tmp]) -case x$mfx_tmp in - xpassed | xyes) ;; - *) - AC_MSG_NOTICE([]) - AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ]) - AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending]) - AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.]) - AC_MSG_NOTICE([Thanks for your support.]) - AC_MSG_NOTICE([]) - AC_MSG_ERROR([ACC conformance test failed. Stop.]) -dnl AS_EXIT - ;; -esac -])# mfx_MINIACC_ACCCHK - - - -# serial 1 - -AC_DEFUN([mfx_PROG_CPPFLAGS], [ -AC_MSG_CHECKING([whether the C preprocessor needs special flags]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#include <limits.h> -#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul) -# include "your C preprocessor is broken 1" -#elif (0xffffu == 0xfffffffful) -# include "your C preprocessor is broken 2" -#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX) -# include "your C preprocessor is broken 3" -#endif -]], [[ ]] -)]) - -mfx_save_CPPFLAGS=$CPPFLAGS -mfx_tmp=ERROR -for mfx_arg in "" -no-cpp-precomp -do - CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS" - _AC_COMPILE_IFELSE([], -[mfx_tmp=$mfx_arg -break]) -done -CPPFLAGS=$mfx_save_CPPFLAGS -rm -f conftest.$ac_ext conftest.$ac_objext -case x$mfx_tmp in - x) - AC_MSG_RESULT([none needed]) ;; - xERROR) - AC_MSG_RESULT([ERROR]) - AC_MSG_ERROR([your C preprocessor is broken - for details see config.log]) - ;; - *) - AC_MSG_RESULT([$mfx_tmp]) - CPPFLAGS="$mfx_tmp $CPPFLAGS" - ;; -esac -])# mfx_PROG_CPPFLAGS - - - -# serial 3 - -AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [ -AC_CACHE_CHECK([whether limits.h is sane], -mfx_cv_header_sane_limits_h, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <limits.h> -#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul) -# if defined(__APPLE__) && defined(__GNUC__) -# error "your preprocessor is broken - use compiler option -no-cpp-precomp" -# else -# include "your preprocessor is broken" -# endif -#endif -#define MFX_0xffff 0xffff -#define MFX_0xffffffffL 4294967295ul -#if !defined(CHAR_BIT) || (CHAR_BIT != 8) -# include "error CHAR_BIT" -#endif -#if !defined(UCHAR_MAX) -# include "error UCHAR_MAX 1" -#endif -#if !defined(USHRT_MAX) -# include "error USHRT_MAX 1" -#endif -#if !defined(UINT_MAX) -# include "error UINT_MAX 1" -#endif -#if !defined(ULONG_MAX) -# include "error ULONG_MAX 1" -#endif -#if !defined(SHRT_MAX) -# include "error SHRT_MAX 1" -#endif -#if !defined(INT_MAX) -# include "error INT_MAX 1" -#endif -#if !defined(LONG_MAX) -# include "error LONG_MAX 1" -#endif -#if (UCHAR_MAX < 1) -# include "error UCHAR_MAX 2" -#endif -#if (USHRT_MAX < 1) -# include "error USHRT_MAX 2" -#endif -#if (UINT_MAX < 1) -# include "error UINT_MAX 2" -#endif -#if (ULONG_MAX < 1) -# include "error ULONG_MAX 2" -#endif -#if (UCHAR_MAX < 0xff) -# include "error UCHAR_MAX 3" -#endif -#if (USHRT_MAX < MFX_0xffff) -# include "error USHRT_MAX 3" -#endif -#if (UINT_MAX < MFX_0xffff) -# include "error UINT_MAX 3" -#endif -#if (ULONG_MAX < MFX_0xffffffffL) -# include "error ULONG_MAX 3" -#endif -#if (USHRT_MAX > UINT_MAX) -# include "error USHRT_MAX vs UINT_MAX" -#endif -#if (UINT_MAX > ULONG_MAX) -# include "error UINT_MAX vs ULONG_MAX" -#endif -]], [[ -#if (USHRT_MAX == MFX_0xffff) -{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; } -#elif (USHRT_MAX >= MFX_0xffff) -{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; } -#endif -#if (UINT_MAX == MFX_0xffff) -{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; } -#elif (UINT_MAX >= MFX_0xffff) -{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; } -#endif -#if (ULONG_MAX == MFX_0xffff) -{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; } -#elif (ULONG_MAX >= MFX_0xffff) -{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; } -#endif -#if (USHRT_MAX == MFX_0xffffffffL) -{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; } -#elif (USHRT_MAX >= MFX_0xffffffffL) -{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; } -#endif -#if (UINT_MAX == MFX_0xffffffffL) -{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; } -#elif (UINT_MAX >= MFX_0xffffffffL) -{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; } -#endif -#if (ULONG_MAX == MFX_0xffffffffL) -{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; } -#elif (ULONG_MAX >= MFX_0xffffffffL) -{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; } -#endif -]])], -[mfx_cv_header_sane_limits_h=yes], -[mfx_cv_header_sane_limits_h=no])]) -]) - -# /*********************************************************************** -# // standard -# ************************************************************************/ - -AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [ -AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])]) -])# - - -# /*********************************************************************** -# // -# ************************************************************************/ - -dnl more types which are not yet covered by ACC - -AC_DEFUN([mfx_CHECK_SIZEOF], [ -AC_CHECK_SIZEOF(__int32) -AC_CHECK_SIZEOF(intmax_t) -AC_CHECK_SIZEOF(uintmax_t) -AC_CHECK_SIZEOF(intptr_t) -AC_CHECK_SIZEOF(uintptr_t) - -AC_CHECK_SIZEOF(float) -AC_CHECK_SIZEOF(double) -AC_CHECK_SIZEOF(long double) - -AC_CHECK_SIZEOF(dev_t) -AC_CHECK_SIZEOF(fpos_t) -AC_CHECK_SIZEOF(mode_t) -AC_CHECK_SIZEOF(off_t) -AC_CHECK_SIZEOF(ssize_t) -AC_CHECK_SIZEOF(time_t) -])# - - - -AC_DEFUN([mfx_CHECK_LIB_WINMM], [ -if test "X$GCC" = Xyes; then -case $host_os in -cygwin* | mingw* | pw32*) - test "X$LIBS" != "X" && LIBS="$LIBS " - LIBS="${LIBS}-lwinmm" ;; -*) - ;; -esac -fi -])# - -#serial 6 - -dnl From Paul Eggert. - -# Define ST_MTIM_NSEC to be the nanoseconds member of struct stat's st_mtim, -# if it exists. - -AC_DEFUN([AC_STRUCT_ST_MTIM_NSEC], - [AC_CACHE_CHECK([for nanoseconds member of struct stat.st_mtim], - ac_cv_struct_st_mtim_nsec, - [ac_save_CPPFLAGS="$CPPFLAGS" - ac_cv_struct_st_mtim_nsec=no - # tv_nsec -- the usual case - # _tv_nsec -- Solaris 2.6, if - # (defined _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED == 1 - # && !defined __EXTENSIONS__) - # st__tim.tv_nsec -- UnixWare 2.1.2 - for ac_val in tv_nsec _tv_nsec st__tim.tv_nsec; do - CPPFLAGS="$ac_save_CPPFLAGS -DST_MTIM_NSEC=$ac_val" - AC_TRY_COMPILE([#include <sys/types.h> -#include <sys/stat.h>], [struct stat s; s.st_mtim.ST_MTIM_NSEC;], - [ac_cv_struct_st_mtim_nsec=$ac_val; break]) - done - CPPFLAGS="$ac_save_CPPFLAGS"]) - - if test $ac_cv_struct_st_mtim_nsec != no; then - AC_DEFINE_UNQUOTED(ST_MTIM_NSEC, $ac_cv_struct_st_mtim_nsec, - [Define to be the nanoseconds member of struct stat's st_mtim, - if it exists.]) - fi - ] -) diff --git a/meta-openembedded/meta-oe/recipes-support/lzop/lzop_1.04.bb b/meta-openembedded/meta-oe/recipes-support/lzop/lzop_1.04.bb deleted file mode 100644 index d9b3524b67..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/lzop/lzop_1.04.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Real-time file compressor" -DESCRIPTION = "lzop is a compression utility which is designed to be a companion to gzip. \n\ -It is based on the LZO data compression library and its main advantages over \n\ -gzip are much higher compression and decompression speed at the cost of some \n\ -compression ratio. The lzop compression utility was designed with the goals \n\ -of reliability, speed, portability and with reasonable drop-in compatibility \n\ -to gzip." -HOMEPAGE = "http://www.lzop.org/" -DEPENDS += "lzo" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://src/lzop.c;beginline=5;endline=21;md5=23d767de7754eb24b9e900b025cf7fc8" - -SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \ - file://acinclude.m4 \ - " -SRC_URI[md5sum] = "271eb10fde77a0a96b9cbf745e719ddf" -SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41" - -inherit autotools - -do_configure:prepend () { - install -Dm 0644 ${WORKDIR}/acinclude.m4 ${S}/acinclude.m4 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb index fd302db897..05e98e86ed 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -15,7 +15,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git; file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ " SRCREV = "025014dedca39d2b8a57a82e52286e72e157d73a" -PV = "20222810+git${SRCPV}" +PV = "20222810+git" RDEPENDS:${PN} = "mcelog mce-inject dialog bash" diff --git a/meta-openembedded/meta-oe/recipes-support/md4c/md4c_0.4.8.bb b/meta-openembedded/meta-oe/recipes-support/md4c/md4c_0.5.2.bb index fc3dbb3ae9..6c409666fc 100644 --- a/meta-openembedded/meta-oe/recipes-support/md4c/md4c_0.4.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/md4c/md4c_0.5.2.bb @@ -3,7 +3,7 @@ DESCRIPTION = "MD4C is Markdown parser implementation in C." HOMEPAGE = "http://github.com/mity/md4c" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7e0fbcf3701aad22f2d2e0624a703795" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=383f39920f391605af6e8e46e60e2378" S = "${WORKDIR}/git" @@ -12,6 +12,6 @@ SRC_URI = " \ git://github.com/mity/md4c.git;protocol=https;branch=master \ " -SRCREV = "c3340b480e5232711858108be07460a9836c8ab5" +SRCREV = "729e6b8b320caa96328968ab27d7db2235e4fb47" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb index 5193df3174..b10c23984d 100644 --- a/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/ne10/ne10_1.2.1.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/projectNe10/Ne10.git;branch=master;protocol=https \ SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f" S = "${WORKDIR}/git" -PV .= "gitr+${SRCPV}" +PV .= "+git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-support/neon/neon_0.32.5.bb b/meta-openembedded/meta-oe/recipes-support/neon/neon_0.33.0.bb index c364aab360..a0333f4560 100644 --- a/meta-openembedded/meta-oe/recipes-support/neon/neon_0.32.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/neon/neon_0.33.0.bb @@ -11,7 +11,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "4872e12f802572dedd4b02f870065814b2d5141f7dbdaf708eedab826b51a58a" +SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8" inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch deleted file mode 100644 index 265d723c6e..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/fix-build-with-protobuf-v22.patch +++ /dev/null @@ -1,203 +0,0 @@ -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.9.0.bb index 85eb230b08..cf836d3ecf 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.9.0.bb @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "f9a59f2592993d3dcc080e495f4f5e02dd8ec7ef" -SRCREV_contrib = "f10c84d48b0714f2b408c9e5cccfac1277c8e6cc" +SRCREV_opencv = "dad8af6b17f8e60d7b95a1203a1b4d22f56574cf" +SRCREV_contrib = "c7602a8f74205e44389bd6a4e8d727d32e7e27b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" @@ -31,7 +31,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=ht file://download.patch \ file://0001-Make-ts-module-external.patch \ file://0008-Do-not-embed-build-directory-in-binaries.patch \ - file://fix-build-with-protobuf-v22.patch \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" @@ -114,8 +113,7 @@ PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtu PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine" PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," -PACKAGECONFIG[python2] = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python-numpy," -PACKAGECONFIG[python3] = "-DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," +PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,," @@ -123,13 +121,9 @@ PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract, PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," -inherit pkgconfig cmake - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} +inherit pkgconfig cmake setuptools3-base python3native export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -export PYTHON="${STAGING_BINDIR_NATIVE}/${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3', 'python', d)}" export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" @@ -139,7 +133,6 @@ TARGET_CC_ARCH += "-I${S}/include " PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${BPN}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${BPN}', '', d)} \ ${PN}-apps" @@ -186,10 +179,6 @@ INSANE_SKIP:${PN}-dbg = "libdir" ALLOW_EMPTY:${PN} = "1" -SUMMARY:python-opencv = "Python bindings to opencv" -FILES:python-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS:python-opencv = "python-core python-numpy" - SUMMARY:python3-opencv = "Python bindings to opencv" FILES:python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS:python3-opencv = "python3-core python3-numpy" diff --git a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb index 4ec256bb99..cc0d88faca 100644 --- a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://gitlab.com/wsakernel/picocom" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" BASEPV = "2023-04" -PV = "${BASEPV}+git${SRCPV}" +PV = "${BASEPV}+git" SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb index fe75415de2..ed58c4a76f 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" DEPENDS = "pidgin json-glib" -PV = "0.1+gitr${SRCPV}" +PV = "0.1+git" inherit pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb index 96b97b6744..1981f1ee9c 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" S = "${WORKDIR}/git" -PV = "1.7+git${SRCPV}" +PV = "1.7+git" do_compile() { oe_runmake -C skypeweb; diff --git a/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb b/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb index 19412a517e..816ee967c1 100644 --- a/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb @@ -16,8 +16,7 @@ DEPENDS = "\ p11-kit \ " -SRCREV = "e2abc4a7ae33159f2fb21b9d87a05ea9e79ef584" -PV = "0.2+git" +SRCREV = "58040b4e32975cc1d7f39e424ee7b0097cd11311" SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index c49a2599ac..2bf4d0a449 100644 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -3,7 +3,7 @@ SECTION = "libs/multimedia" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26107732c2ab637c5710446fcfaf02df" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https" SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97" diff --git a/meta-openembedded/meta-oe/recipes-support/rtkit/rtkit_0.13.bb b/meta-openembedded/meta-oe/recipes-support/rtkit/rtkit_0.13.bb index 7ae9925038..4f06e55e8e 100644 --- a/meta-openembedded/meta-oe/recipes-support/rtkit/rtkit_0.13.bb +++ b/meta-openembedded/meta-oe/recipes-support/rtkit/rtkit_0.13.bb @@ -19,5 +19,5 @@ PACKAGECONFIG[systemd] = ",,systemd" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --user-group --shell /bin/nologin rtkit" -FILES:${PN} += "${libdir} ${datadir}" +FILES:${PN} += "${libdir} ${datadir} ${systemd_system_unitdir}" diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.42.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.43.bb index 62cdad6fb0..9e6d701c7f 100644 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.42.bb +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.43.bb @@ -10,7 +10,7 @@ inherit autotools-brokensep python3native python3targetconfig pkgconfig SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \ file://0002-fix-compile-failure-against-musl-C-library.patch \ " -SRCREV = "23483cebb238df86cda8b6529e3c58080dc2029d" +SRCREV = "5891618d6a95afc4cde6757374485adf9bf0e9a5" S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" diff --git a/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb index 2fe61e6f59..82994331ee 100644 --- a/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb +++ b/meta-openembedded/meta-oe/recipes-support/serial-utils/pty-forward-native.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/network" SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec" -PV = "1.1+gitr${SRCPV}" +PV = "1.1+git" SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master" S = "${WORKDIR}/git/tools/serial_forward" diff --git a/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb index 84bb25e4cd..541ae84a93 100644 --- a/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/serial-utils/serial-forward_git.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ebb5c50ab7cab4baeffba14977030c07" SECTION = "console/devel" SRCREV = "07c6fdede0870edc37a8d51d033b6e7e29aa7c91" -PV = "1.1+gitr${SRCPV}" +PV = "1.1+git" SRC_URI = "git://github.com/freesmartphone/cornucopia.git;branch=master;protocol=https \ file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \ diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb index 15380f5d7f..9dc393fd08 100644 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https" -SRCREV = "cbb9c3c5162a0d7018c7b3e053153a04d4fbbbb9" +SRCREV = "50f55c59d1b66910837313c40d11328d03447a41" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch b/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch deleted file mode 100644 index ff2743eb68..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user/0001-cli-Fix-format-security-warning.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2d61587f85d1bf57287d12b470afb94c0bf9249d Mon Sep 17 00:00:00 2001 -From: Davide Cavalca <dcavalca@fedoraproject.org> -Date: Mon, 27 Jun 2022 16:54:35 -0700 -Subject: [PATCH] cli: Fix format security warning - -Upstream-Status: Submitted [https://github.com/Microsemi/switchtec-user/pull/316] - ---- - cli/graph.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cli/graph.c b/cli/graph.c -index 5748914..95609de 100644 ---- a/cli/graph.c -+++ b/cli/graph.c -@@ -134,7 +134,7 @@ static void draw_status(WINDOW *win, int x_off, int x_cnt, const char *status) - mvwprintw(win, 0, 0, " "); - for (i = 0; i < x_cnt * 2 + x_off; i++) - mvwaddch(win, 1, i, ' '); -- mvwprintw(win, 1, x_off, status); -+ mvwprintw(win, 1, x_off, "%s", status); - wrefresh(win); - } - --- -2.39.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb b/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb index 443e5bc493..17f54dcf4c 100644 --- a/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user_4.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb @@ -6,12 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6b07c89629cff2990d2e8e1f4c2382" DEPENDS = "ncurses openssl" -SRCREV = "762ba441d2c02685f98e5f56e984db033bab279a" -SRC_URI = " \ - git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master \ - file://0001-cli-Fix-format-security-warning.patch \ -" -SRC_URI[sha256sum] = "f98c1fe23e1d7a11fb23e8bcf9b563929fc805ea669191a7fd525ad16519f655" +SRCREV = "e7c351c6c722336b3c79b79cd002c7c2986eefb0" +SRC_URI = "git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master" +SRC_URI[sha256sum] = "a715e46d8498418dbb8a2519318ba0714ee148151d7e4a7fa5e27770a2f6888f" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb index f2e7a91618..fb767942fe 100644 --- a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1" # Version 1.10.1-stable SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f" -PV = "1.10.1+git${SRCPV}" +PV = "1.10.1+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb index 650c7bd5f3..77a5e67a42 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb @@ -30,6 +30,8 @@ SRC_URI[sha256sum] = "c16eafe447191c079f471846182876b7919d3d789af8c1f9fe55ab1452 UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" +CVE_STATUS[CVE-2022-38725] = "cpe-incorrect: cve-check wrongly matches cpe:2.3:a:oneidentity:syslog-ng:*:*:*:*:premium:*:*:* < 7.0.32" + inherit autotools gettext systemd pkgconfig update-rc.d multilib_header EXTRA_OECONF = " \ diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb index a6d09f69e9..bd69dbb11c 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-evemu_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://bitmath.org/git/evemu.git;protocol=http;branch=master \ " SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24" -PV = "1.0.6+git${SRCPV}" +PV = "1.0.6+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb index 3b1cf60c27..ddd27a7e30 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-frame_git.bb @@ -16,6 +16,6 @@ SRC_URI = "git://bitmath.org/git/frame.git;protocol=http;branch=master \ " SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc" -PV = "1.1.2+git${SRCPV}" +PV = "1.1.2+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index e348e39bba..d964d7f263 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -14,6 +14,6 @@ SRCREV = "ad437c38dc111cf3990a03abf14efe1b5d89604b" DEPENDS += "mtdev utouch-frame utouch-evemu libx11" -PV = "1.1.7+git${SRCPV}" +PV = "1.1.7+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb b/meta-openembedded/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb index f8a07eb644..0aa8724281 100644 --- a/meta-openembedded/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb @@ -8,6 +8,7 @@ REQUIRED_DISTRO_FEATURES = "polkit" DEPENDS = " \ json-glib \ glib-2.0 \ + glib-2.0-native \ flatpak \ libportal \ geoclue \ diff --git a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb index 3be1f27a6f..975779cd18 100644 --- a/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/zbar/zbar_git.bb @@ -16,7 +16,7 @@ SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \ SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" S = "${WORKDIR}/git" -PV = "0.23.1+git${SRCPV}" +PV = "0.23.1+git" DEPENDS += "xmlto-native" diff --git a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb index 44077a0d35..6c94e9e275 100644 --- a/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb +++ b/meta-openembedded/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb @@ -7,7 +7,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "a01cc69ee9536f90e57c61a198f2d1944d3d4313" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1 \ file://0001-include-Check-for-previous-declaration-of-uintptr_t.patch \ file://run-ptest \ @@ -22,15 +22,15 @@ EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE LTO = "" do_install:append () { - install -d ${D}${datadir}/${BPN}/example - install -d ${D}${datadir}/${BPN}/example/mock/chef_wrap - install -d ${D}${datadir}/${BPN}/example/mock/uptime - - install -m 0755 ${B}/example/*_test ${D}/${datadir}/${BPN}/example - install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${datadir}/${BPN}/example/mock/chef_wrap - install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${datadir}/${BPN}/example/mock/uptime - install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${datadir}/${BPN}/example/mock/uptime - install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${datadir}/${BPN}/example/mock/libproc_uptime.so + install -d ${D}${libdir}/${BPN}/example + install -d ${D}${libdir}/${BPN}/example/mock/chef_wrap + install -d ${D}${libdir}/${BPN}/example/mock/uptime + + install -m 0755 ${B}/example/*_test ${D}/${libdir}/${BPN}/example + install -m 0755 ${B}/example/mock/chef_wrap/waiter_test_wrap ${D}/${libdir}/${BPN}/example/mock/chef_wrap + install -m 0755 ${B}/example/mock/uptime/uptime ${D}/${libdir}/${BPN}/example/mock/uptime + install -m 0755 ${B}/example/mock/uptime/test_uptime ${D}/${libdir}/${BPN}/example/mock/uptime + install -m 0644 ${B}/example/mock/uptime/libproc_uptime.so ${D}/${libdir}/${BPN}/example/mock/libproc_uptime.so } do_install_ptest () { @@ -40,5 +40,4 @@ do_install_ptest () { PACKAGE_BEFORE_PN += "${PN}-examples" -FILES:${PN}-examples = "${datadir}/${BPN}/example" -INSANE_SKIP:${PN}-examples = "libdir" +FILES:${PN}-examples = "${libdir}/${BPN}/example" diff --git a/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb b/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb index 7abdcb2523..e909676abc 100644 --- a/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/MIT;md5=544799d0b492f119fa04641d1b8868ed" SRC_URI = "git://github.com/cbrake/linux-serial-test.git;protocol=https;branch=master" -PV = "0+git${SRCPV}" +PV = "0+git" SRCREV = "2ee61484167eab846f7b7c565284d7c350d738d3" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.084.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.085.bb index c4fcc5eb8f..f7b3d416df 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.084.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.085.bb @@ -21,7 +21,7 @@ RDEPENDS:${PN} += "\ " SRC_URI = "${CPAN_MIRROR}/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz" -SRC_URI[sha256sum] = "a60d1e04e192363155329560498abd3412c3044295dae092d27fb6e445c71ce1" +SRC_URI[sha256sum] = "95b2f7c0628a7e246a159665fbf0620d0d7835e3a940f22d3fdd47c3aa799c2e" S = "${WORKDIR}/IO-Socket-SSL-${PV}" 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 44507b394e..5985482628 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 @@ -7,6 +7,7 @@ # # ptests which take less than ~30s each PTESTS_FAST_META_PYTHON = "\ + python3-appdirs \ python3-ansicolors \ python3-asgiref \ python3-aspectlib \ @@ -38,6 +39,7 @@ PTESTS_FAST_META_PYTHON = "\ python3-pyserial \ python3-pytest-mock \ python3-pytoml \ + python3-pyyaml-include \ python3-rapidjson \ python3-requests-file \ python3-requests-toolbelt \ @@ -48,11 +50,13 @@ PTESTS_FAST_META_PYTHON = "\ python3-soupsieve \ python3-sqlparse \ python3-tomlkit \ + python3-ujson \ python3-u-msgpack-python \ python3-unidiff \ python3-uritemplate \ python3-xmltodict \ python3-xxhash \ + python3-yarl \ " PTESTS_SLOW_META_PYTHON = "\ @@ -61,7 +65,6 @@ PTESTS_SLOW_META_PYTHON = "\ " PTESTS_PROBLEMS_META_PYTHON ="\ - python3-appdirs \ python3-betamax \ python3-dnspython \ python3-fastjsonschema \ @@ -83,7 +86,5 @@ PTESTS_PROBLEMS_META_PYTHON ="\ python3-trustme \ python3-typeguard \ python3-whoosh \ - python3-ujson \ python3-xlrd \ - python3-yarl \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/gyp/gyp_git.bb b/meta-openembedded/meta-python/recipes-devtools/gyp/gyp_git.bb index 0f94a4476d..6ac4228a8b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/gyp/gyp_git.bb +++ b/meta-openembedded/meta-python/recipes-devtools/gyp/gyp_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://chromium.googlesource.com/external/gyp;protocol=https;branch=ma SRCREV = "a03d7413becefc8d55c8aa3df58b55b9bd0e9052" S = "${WORKDIR}/git" -PV = "0.1+git${SRCPV}" +PV = "0.1+git" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python-jsonref/files/migrate-to-pdm-backend.patch b/meta-openembedded/meta-python/recipes-devtools/python-jsonref/files/migrate-to-pdm-backend.patch index 805d9edce1..709a38c4aa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python-jsonref/files/migrate-to-pdm-backend.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python-jsonref/files/migrate-to-pdm-backend.patch @@ -4,6 +4,7 @@ Date: Tue, 7 Nov 2023 10:43:32 +0000 Subject: [PATCH] Migrate to pdm-backend Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> +Upstream-Status: Pending --- pyproject.toml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_2.1.0.bb index 42c7f3f84a..5bdb83175d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_2.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-absl_2.1.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "d9690211c5fcfefcdd1a45470ac2b5c5acd45241c3af71eed96bc5441746c0d5" +SRC_URI[sha256sum] = "7820790efbb316739cde8b4e19357243fc3608a152024288513dd968d7d959ff" PYPI_PACKAGE = "absl-py" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiodns_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiodns_3.1.1.bb index 5c685d7e40..02a0b4ea2c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiodns_3.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiodns_3.1.1.bb @@ -14,3 +14,5 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-asyncio \ ${PYTHON_PN}-pycares \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.3.2.bb new file mode 100644 index 0000000000..0ca4834773 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.3.2.bb @@ -0,0 +1,12 @@ +SUMMARY = "Happy Eyeballs" +DESCRIPTION = "This library exists to allow connecting with Happy Eyeballs when you already have a list of addrinfo and not a DNS name." +HOMEPAGE = "https://github.com/aio-libs/aiohappyeyeballs" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" + +SRC_URI[sha256sum] = "77e15a733090547a1f5369a1287ddfc944bd30df0eb8993f585259c34b405f4e" + +inherit pypi python_poetry_core + +BBCLASSSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.3.bb index 566417047e..99fb84cd51 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.3.bb @@ -4,24 +4,17 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=748073912af33aa59430d3702aa32d41" -SRC_URI[sha256sum] = "8fc49a87ac269d4529da45871e2ffb6874e87779c3d0e2ccd813c0899221239d" +SRC_URI[sha256sum] = "90842933e5d1ff760fae6caca4b2b3edba53ba8f4b71e95dacf2818a2aca06f7" PYPI_PACKAGE = "aiohttp" inherit python_setuptools_build_meta pypi RDEPENDS:${PN} = "\ + ${PYTHON_PN}-aiohappyeyeballs \ + ${PYTHON_PN}-aiosignal \ ${PYTHON_PN}-async-timeout \ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-chardet \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-idna-ssl \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-misc \ + ${PYTHON_PN}-frozenlist \ ${PYTHON_PN}-multidict \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-typing-extensions \ ${PYTHON_PN}-yarl \ - ${PYTHON_PN}-cchardet \ - ${PYTHON_PN}-charset-normalizer \ - ${PYTHON_PN}-aiosignal \ + ${PYTHON_PN}-aiodns \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansicolors/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansicolors/run-ptest index 7dc3ef32be..922353a1f3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansicolors/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansicolors/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO test.py| 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}}' +pytest --automake test.py diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansicolors_1.1.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansicolors_1.1.8.bb index 0e32443992..b63cc32a23 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansicolors_1.1.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansicolors_1.1.8.bb @@ -14,7 +14,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-anyio_4.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-anyio_4.2.0.bb new file mode 100644 index 0000000000..0bf907de78 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-anyio_4.2.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "High level compatibility layer for multiple asynchronous event loop implementations" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c0a769411d2af7894099e8ff75058c9f" + +inherit pypi python_setuptools_build_meta + +SRC_URI[sha256sum] = "e1875bb4b4e2de1669f4bc7869b6d3f54231cdced71605e6e64c9be77e3be50f" + +DEPENDS += " \ + python3-setuptools-scm-native \ +" + +# Don't provide "trio" PACKAGECONFIG as nothing provides "python3-trio" currently. +# If somebody needs this please feel free to add python3-trio and enable the +# packageconfig below: +#PACKAGECONFIG ??= "" +#PACKAGECONFIG[trio] = ",,,python3-trio" + +RDEPENDS:${PN} += "\ + python3-idna \ + python3-sniffio \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb index 95d1ac05ac..ad07b3b082 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-appdirs_1.4.4.bb @@ -12,7 +12,8 @@ SRC_URI[sha256sum] = "7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27 inherit pypi setuptools3 ptest RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.2.2.bb index e6b9af084c..fffecf521d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.2.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/kislyuk/argcomplete" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "437f67fb9b058da5a090df505ef9be0297c4883993f3f56cb186ff087778cfb4" +SRC_URI[sha256sum] = "f3e49e8ea59b4026ee29548e24488af46e30c9de57d48638e24f54a1ea1000a2" PYPI_PACKAGE = "argcomplete" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.2.bb index 24a579fb93..afcd7d9665 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.2.bb @@ -12,10 +12,9 @@ tool; Argh just makes it easy to use." LICENSE = "LGPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ - file://README.rst;beginline=261;endline=275;md5=ba124578a6853962d5038eabef535d12 \ " -SRC_URI[sha256sum] = "b93093544309ddbfe6c73dc9bfd60dbc4acecef39f3f464774b3084a1ec5d7b0" +SRC_URI[sha256sum] = "db1c34885804f7d4646c385dc2fb19b45298561322f4c15eae1b133993f9e323" inherit pypi python_flit_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref_3.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref_3.7.2.bb index c9081c8cbb..b7fa9f0360 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref_3.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asgiref_3.7.2.bb @@ -15,10 +15,11 @@ export HOST_SYS inherit pypi ptest setuptools3 RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-multiprocessing \ + python3-asyncio \ + python3-io \ + python3-multiprocessing \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.3.bb index 23501ce000..1b8787215d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.3.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "4a61cf0a59097c7bb52689b0fd63717cd2a8a14dc9f1eee97b82d814881c8c91" +SRC_URI[sha256sum] = "4148645659b08b70d72460ed1921158027a9e53ae8b7234149b1400eddacbb93" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.6.bb index a7820c5ab2..34f7187d46 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asyncinotify_4.0.6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://gitlab.com/Taywee/asyncinotify" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f75d2927d3c1ed2414ef72048f5ad640" -SRC_URI[sha256sum] = "95840eec6804797f9e8ee6d65a9d2a1159e77c5395a468dcfa4f44338ed1f8b6" +SRC_URI[sha256sum] = "c03fdb1a7dbb6bed8ede763e4e0ac224a2a3157bdc51e4ba3832588a3c29904d" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache/run-ptest deleted file mode 100644 index b63c4de0d9..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-backports-functools-lru-cache/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-bandit_1.7.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.7.bb index 3cf927e103..2de7fc7ae6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.7.bb @@ -2,7 +2,7 @@ SUMMARY = "Security oriented static analyser for python code." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI[sha256sum] = "72ce7bc9741374d96fb2f1c9a8960829885f1243ffde743de70a19cee353e8f3" +SRC_URI[sha256sum] = "527906bec6088cb499aae31bc962864b4e77569e9d529ee51df3a93b4b8ab28a" DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.3.bb index 7eb2d7c345..6283098773 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = " https://www.crummy.com/software/BeautifulSoup/bs4" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=96e0034f7c9443910c486773aa1ed9ac" -SRC_URI[sha256sum] = "492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da" +SRC_URI[sha256sum] = "74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051" inherit pypi python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb index feb9ab3e27..468a1075b1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-betamax_0.8.1.bb @@ -19,7 +19,8 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-binwalk_2.3.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-binwalk_2.3.4.bb index 0b7d97fccb..45b1ff5145 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-binwalk_2.3.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-binwalk_2.3.4.bb @@ -12,6 +12,8 @@ SRCREV = "cddfede795971045d99422bd7a9676c8803ec5ee" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + inherit setuptools3 RDEPENDS:${PN} += " \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker/run-ptest index 15c3f6282d..69cd362f69 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.7.0.bb index f1d8b4fa95..8f2cf4883d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-blinker_1.7.0.bb @@ -9,11 +9,12 @@ inherit pypi python_setuptools_build_meta ptest SRC_URI += "file://run-ptest" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-asyncio \ + python3-asyncio \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { 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.14.0.bb index b4c90bcffd..1e374529cc 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.14.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/CacheControl/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=12;endline=12;md5=e2fd6ddcf506e08972d5ba4b93c0022e" -SRC_URI[sha256sum] = "f012366b79d2243a6118309ce73151bf52a38d4a5dac8ea57f09bd29087e506b" +SRC_URI[sha256sum] = "7db1195b41c81f8274a7bbd97c956f44e8348265a1bc7641c37dfebc39f0c938" inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.2.bb index 5946c267aa..22060ef049 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.2.bb @@ -15,11 +15,12 @@ SRC_URI += " \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-math \ + python3-math \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.3.bb index ad2025e644..3cf9560837 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "8069a8f473bb1679990bea0903f3a22d58df5495aebbf09f58d49f627511b619" +SRC_URI[sha256sum] = "7aaa3d246bc5328bb29c681fc8162d2800be05ee095b3edb9470fa1478f9e506" PYPI_PACKAGE = "cantools" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-casttube_0.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-casttube_0.2.0.bb new file mode 100644 index 0000000000..408dff87bf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-casttube_0.2.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "YouTube Chromecast API" +HOMEPAGE = "https://github.com/ur1katz/casttube" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489" + +SRC_URI[md5sum] = "4bb24ba1639d16c8fa367537bf3b88a6" +SRC_URI[sha256sum] = "f25b3c634efe702896233690f7590e8d6311590910f18dbb763b90419d9ef53c" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = "\ + ${PYTHON_PN}-requests \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.6.1.bb index c8cfaa8aa3..e2493e4e1f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.6.1.bb @@ -1,10 +1,10 @@ DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." -DEPENDS +="${PYTHON_PN}-setuptools-scm-native" +DEPENDS +="python3-setuptools-scm-native" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "f9e192f461a9f8f6082df28c035b006d153904213dc8640bed8a72d72bbc9475" +SRC_URI[sha256sum] = "752130e38644319f3dae7f91fabb08f58bc454ca671b72875e6228d423890efd" inherit pypi python_setuptools_build_meta ptest @@ -15,18 +15,19 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-hypothesis \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unixadmin \ + python3-hypothesis \ + python3-pytest \ + python3-unittest-automake-output \ + python3-unixadmin \ " do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ + python3-datetime \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_6.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_6.8.2.bb index 6aefef6d13..c26f4bb70e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_6.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorlog_6.8.2.bb @@ -7,6 +7,6 @@ inherit pypi setuptools3 PYPI_PACKAGE = "colorlog" -SRC_URI[sha256sum] = "fbb6fdf9d5685f2517f388fb29bb27d54e8654dd31f58bc2a3b217e967a95ca6" +SRC_URI[sha256sum] = "3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44" RDEPENDS:${PN} += "python3-logging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-covdefaults/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-covdefaults/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-covdefaults/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-covdefaults/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake 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 a0ef2af828..7391c3ae2e 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 @@ -16,11 +16,12 @@ S = "${WORKDIR}/git" inherit setuptools3 ptest RDEPENDS:${PN} += " \ - ${PYTHON_PN}-coverage \ + python3-coverage \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.4.1.bb index 30922697ab..b3da5d5716 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.4.1.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] = "707c0f58cb1712b8809ece32b68996ee1e609f71bd14615bd8f87a1293cb610e" +SRC_URI[sha256sum] = "1ed4b95480952b1a26d863e546fa5094564aa0065e1e5f0d4d0041f293251d04" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cytoolz_0.12.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cytoolz_0.12.3.bb index fa8549c541..6c35ad5807 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cytoolz_0.12.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cytoolz_0.12.3.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d422ebce3e9c6447563bd410e9b22f2e" -SRC_URI[sha256sum] = "31d4b0455d72d914645f803d917daf4f314d115c70de0578d3820deb8b101f66" +SRC_URI[sha256sum] = "4503dc59f4ced53a54643272c61dc305d1dbbfbd7d6bdf296948de9f34c3a282" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.1.bb index 5698ae99f4..9e2566175d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.1.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] = "f582f6f16791ced6067dab325fae444edf7ce0704315b90c2a473090636a6fe0" +SRC_URI[sha256sum] = "87b852d2005f1d59399ca51c5f3538f28a4742d739d7abe82b7ae8d01d8a5d02" 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.8.bb index 673964f3b7..4ea5aa04a4 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.8.bb @@ -1,9 +1,9 @@ SUMMARY = "Serialize all of python" HOMEPAGE = "https://pypi.org/project/dill/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=19de1f406e29e68f579e7e82e0758ce3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a41509b57cc475ed93f8cb1dbbfaeec1" -SRC_URI[sha256sum] = "cc1c8b182eb3013e24bd475ff2e9295af86c1a38eb1aff128dac8962a9ce3c03" +SRC_URI[sha256sum] = "3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.10.bb index 7f933d1a37..45de692356 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.10.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "110fb58fb12eca59e072ad59fc42d771cd642dd7a2f2416582aa9da7a8ef954a" +SRC_URI[sha256sum] = "b1260ed381b10a11753c73444408e19869f3241fc45c985cd55a30177c789d13" RDEPENDS:${PN} += "\ ${PYTHON_PN}-sqlparse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.1.bb index bad4245233..eed1e6edc6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.1.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "7d29e14dfbc19cb6a95a4bd669edbde11f5d4c6a71fdaa42c2d40b6846e807f7" +SRC_URI[sha256sum] = "8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854" RDEPENDS:${PN} += "\ ${PYTHON_PN}-sqlparse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.5.0.bb index 1ebd2aa943..c5c8d42e2d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.5.0.bb @@ -3,16 +3,17 @@ HOMEPAGE = "http://www.dnspython.org/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" -SRC_URI[sha256sum] = "8dcfae8c7460a2f84b4072e26f1c9f4101ca20c071649cb7c34e8b6a93d58984" +SRC_URI[sha256sum] = "a0034815a59ba9ae888946be7ccca8f7c157b286f8455b379c692efb51022a15" -inherit pypi python_poetry_core ptest +inherit pypi python_hatchling ptest SRC_URI += " \ file://run-ptest \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { @@ -21,15 +22,15 @@ do_install_ptest() { } DEPENDS += "\ - ${PYTHON_PN}-wheel-native \ - ${PYTHON_PN}-setuptools-scm-native \ + python3-wheel-native \ + python3-setuptools-scm-native \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ + python3-crypt \ + python3-io \ + python3-math \ + python3-netclient \ + python3-numbers \ + python3-threading \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb index 3bd9d87547..054d5236e5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dominate_2.9.1.bb @@ -11,7 +11,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { @@ -20,6 +21,6 @@ do_install_ptest() { } RDEPENDS:${PN} += "\ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ + python3-numbers \ + python3-threading \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.2.0.bb index 7b6aad7c98..fe0e99a20e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.1.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.2.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[sha256sum] = "c2d6dc524b29ef751ecfc416b0627668119d8812441c555d7471da41d4bacb8d" +SRC_URI[sha256sum] = "c53f6531e602dd596a729f75833146ada40c2445a10dae36d9e461068b63af29" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-abi_4.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-abi_5.0.0.bb index c01860acd7..50b1340cb3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-abi_4.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-abi_5.0.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=731f4de9c79bfeba6d8d55f83d0d2423" -SRC_URI[sha256sum] = "60d88788d53725794cdb07c0f0bb0df2a31a6e1ad19644313fe6117ac24eeeb0" +SRC_URI[sha256sum] = "89c4454d794d9ed92ad5cb2794698c5cee6b7b3ca6009187d0e282adc7f9b6dc" PYPI_PACKAGE = "eth_abi" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-account_0.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-account_0.10.0.bb deleted file mode 100644 index 1854e3bcac..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-account_0.10.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Assign Ethereum transactions and messages with local private keys." -HOMEPAGE = "https://github.com/ethereum/eth-account" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=16ffc86adf4293d4cfb204e77d62cfe6" - -SRC_URI[sha256sum] = "474a2fccf7286230cf66502565f03b536921d7e1fdfceba198e42160e5ac4bc1" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-bitarray \ - python3-cytoolz \ - python3-eth-abi \ - python3-eth-keyfile \ - python3-eth-rlp \ - python3-hexbytes \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-account_0.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-account_0.11.0.bb new file mode 100644 index 0000000000..84c270df64 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-account_0.11.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Assign Ethereum transactions and messages with local private keys." +HOMEPAGE = "https://github.com/ethereum/eth-account" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=16ffc86adf4293d4cfb204e77d62cfe6" + +SRC_URI[sha256sum] = "2ffc7a0c7538053a06a7d11495c16c7ad9897dd42be0f64ca7551e9f6e0738c3" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-bitarray \ + ${PYTHON_PN}-eth-abi \ + ${PYTHON_PN}-eth-keyfile \ + ${PYTHON_PN}-eth-keys \ + ${PYTHON_PN}-eth-rlp \ + ${PYTHON_PN}-eth-utils \ + ${PYTHON_PN}-hexbytes \ + ${PYTHON_PN}-rlp \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keys_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keys_0.5.0.bb index b0b1aad76d..aabfff1b1d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keys_0.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-keys_0.5.0.bb @@ -2,9 +2,9 @@ SUMMARY = "A common API for Ethereum key operations with pluggable backends." HOMEPAGE = "https://github.com/ethereum/eth-keys" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2beaef1b1764f4d6b46084c885b4bcad" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6749008d847c14b9718949c2e24d5c0a" -SRC_URI[sha256sum] = "7d18887483bc9b8a3fdd8e32ddcb30044b9f08fcb24a380d93b6eee3a5bb3216" +SRC_URI[sha256sum] = "a0abccb83f3d84322591a2c047a1e3aa52ea86b185fa3e82ce311d120ca2791e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-rlp_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-rlp_1.0.1.bb index 5cd0d0544e..243f75f5b6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-rlp_1.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-rlp_1.0.1.bb @@ -4,12 +4,13 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" -SRC_URI[sha256sum] = "a988d713a36452e7c6da71186798343f687eaf3aeb7f99266750dd9e1f754c7b" +SRC_URI[sha256sum] = "d61dbda892ee1220f28fb3663c08f6383c305db9f1f5624dc585c9cd05115027" inherit pypi setuptools3 RDEPENDS:${PN} = " \ - python3-eth-utils \ - python3-hexbytes \ - python3-rlp \ + ${PYTHON_PN}-eth-utils \ + ${PYTHON_PN}-hexbytes \ + ${PYTHON_PN}-rlp \ + ${PYTHON_PN}-typing-extensions \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_4.0.0.bb index c8044b3897..3ca311db5c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_3.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-typing_4.0.0.bb @@ -4,6 +4,6 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" -SRC_URI[sha256sum] = "22bf051ddfaa35ff827c30090de167e5c5b8cc6d343f7f35c9b1c7553f6ab64d" +SRC_URI[sha256sum] = "9af0b6beafbc5c2e18daf19da5f5a68315023172c4e79d149e12ad10a3d3f731" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_3.0.0.bb index 1f641832f6..faca03865b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_2.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_3.0.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6749008d847c14b9718949c2e24d5c0a" -SRC_URI[sha256sum] = "56a969b0536d4969dcb27e580521de35abf2dbed8b1bf072b5c80770c4324e27" +SRC_URI[sha256sum] = "8721869568448349bceae63c277b75758d11e0dc190e7ef31e161b89619458f1" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.34.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.35.1.bb index 86524da42b..c1d10eca3f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.34.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.35.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778" -SRC_URI[sha256sum] = "2115c7c6742e6893bf1347f82915572f8895c911cb5abaad4d3596a7daa847cc" +SRC_URI[sha256sum] = "3b2eede94d64538cb894eec50302a881e056ed7e057f0e24fb45b28a19d6b2e8" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet_2.0.2.bb index a934d1c461..78a15d3572 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet_2.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-execnet_2.0.2.bb @@ -24,6 +24,7 @@ do_install_ptest() { RDEPENDS:${PN}-ptest += "\ python3-pytest \ + python3-unittest-automake-output \ " RDEPENDS:${PN} += "python3-core python3-crypt python3-ctypes python3-fcntl python3-io python3-shell python3-threading" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb index e0be7b6160..6b74f7260c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb @@ -27,6 +27,7 @@ RDEPENDS:${PN}-ptest += "\ python3-pytest \ python3-pytest-benchmark \ python3-pytest-cache \ + python3-unittest-automake-output \ " RDEPENDS:${PN} += "\ python3-core \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-marshmallow_0.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-marshmallow_0.15.0.bb deleted file mode 100644 index 25ca4d24c8..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-marshmallow_0.15.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Flask + marshmallow for beautiful APIs" -HOMEPAGE = "https://github.com/marshmallow-code/flask-marshmallow" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c3ff8567ef1f2a8cf223f30ac5a6f094" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "2083ae55bebb5142fff98c6bbd483a2f5dbc531a8bc1be2180ed5f75e7f3fccc" - -RDEPENDS:${PN} += "\ - python3-flask \ - python3-marshmallow \ - python3-packaging \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-marshmallow_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-marshmallow_1.2.0.bb new file mode 100644 index 0000000000..573b202910 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-marshmallow_1.2.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Flask + marshmallow for beautiful APIs" +HOMEPAGE = "https://github.com/marshmallow-code/flask-marshmallow" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=27586b20700d7544c06933afe56f7df4" + +inherit pypi python_setuptools_build_meta + +PYPI_PACKAGE = "flask_marshmallow" + +SRC_URI[sha256sum] = "d0f79eb9743f0c530a3d9e848503e1f2228e6b35a819c91e913af02e68421805" + +RDEPENDS:${PN} += "\ + python3-flask \ + python3-marshmallow \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb index e0afd3718f..7692eb116b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/mitsuhiko/flask/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75" -SRC_URI[sha256sum] = "cfadcdb638b609361d29ec22360d6070a77d7463dcb3ab08d2c2f2f168845f58" +SRC_URI[sha256sum] = "822c03f4b799204250a7ee84b1eddc40665395333973dfb9deebfe425fefcb7d" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/Flask" UPSTREAM_CHECK_REGEX = "/Flask/(?P<pver>(\d+[\.\-_]*)+)" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_7.0.bb index bfb0aaf5e7..6e5899ae23 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_7.0.bb @@ -2,10 +2,10 @@ DESCRIPTION = "generate GCC code coverage reports" HOMEPAGE = "https://gcovr.com" SECTION = "devel/python" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6542fc4ce5904ffb741ef56f8fe33452" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5a58ca91c1758a53f896ba89d8aaac2" SRC_URI = "git://github.com/gcovr/gcovr.git;branch=main;protocol=https" -SRCREV = "1221ef62ff0de15bbeaf79e68e08a65d62c73ff4" +SRCREV = "fc190bcb85a25f5738315434a11f8e993edce515" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson_3.1.0.bb index 79ad228d1c..742f921e59 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson_3.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-geojson_3.1.0.bb @@ -12,7 +12,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { 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.6.0.bb index d060a922b7..c0b6a60814 100644 --- 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.6.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/getpatchwork/git-pw" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=26e1a171d943c64f00c51f90c256b9d4" -SRC_URI[sha256sum] = "c60169f9566bd6710f9c0985a005a0c326460b739d3f2b5c5c71e85211584590" +SRC_URI[sha256sum] = "e118e31bbe259ed9ae540d627cc563a6ece553d02aed11b1a92bbac408a0da0e" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.14.bb index 101bfb9aa4..5d8a3ba51c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gmqtt_0.6.14.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/wialon/gmqtt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=903f1792621a3b35ee546da75d139177" -SRC_URI[sha256sum] = "b4623d3e32ba266e96c04b0871bb057d05414371c1d279550648b390e6ba7577" +SRC_URI[sha256sum] = "45b0f7794247455b9163155eeedf41c86e303c72b79056bf65d33038b17443a3" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.16.2.bb index 7ce2ad7add..4d13b2e78e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.15.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.16.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pypi setuptools3 -SRC_URI[sha256sum] = "abc978a72658f14a2df1e5e12532effe40f94f868f6e23d95133bd6abcca35ca" +SRC_URI[sha256sum] = "032d37b45d1d6bdaf68fb11ff621e2593263a239fa9246e2e94325f9c47876d2" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.113.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.116.0.bb index 4e6bb7daf6..e4de12baec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.113.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.116.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] = "bcffbc8ffbad631f699cf85aa91993f3dc03060b234ca9e6e2f9135028bd9b52" +SRC_URI[sha256sum] = "f9f32361e16114d62929638fe07f77be30216b079ad316dc2ced859d9f72e5ad" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth-oauthlib_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth-oauthlib_1.2.0.bb new file mode 100644 index 0000000000..b1e89e4b44 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth-oauthlib_1.2.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Google Authentication Library" +DESCRIPTION = "This library provides oauthlib integration with google-auth" +HOMEPAGE = "https://github.com/googleapis/google-auth-library-python-oauthlib" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "292d2d3783349f2b0734a0a0207b1e1e322ac193c2c09d8f7c613fb7cc501ea8" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-google-auth \ + ${PYTHON_PN}-requests-oauthlib \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.26.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.27.0.bb index 9bd0926ca6..45098e6628 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.26.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.27.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 -SRC_URI[sha256sum] = "97327dbbf58cccb58fc5a1712bba403ae76668e64814eb30f7316f7e27126b81" +SRC_URI[sha256sum] = "e863a56ccc2d8efa83df7a80272601e43487fa9a728a376205c86c26aaefa821" RDEPENDS:${PN} += "\ ${PYTHON_PN}-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb index 8e5c7d48fc..0ec9d95a47 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb @@ -12,7 +12,7 @@ DEPENDS += "${PYTHON_PN}-grpcio" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \ " -SRC_URI[sha256sum] = "ed30499340228d733ff69fcf4a66590ed7921f94eb5a2bf692258b1280b9dac7" +SRC_URI[sha256sum] = "da08224ab8675c6d464b988bd8ca02cccd2bf0275bceefe8f6219bfd4a4f5e85" RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.60.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb index 77b4198e31..6bcb31656c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.60.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb @@ -10,7 +10,7 @@ SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \ " -SRC_URI[sha256sum] = "2199165a1affb666aa24adf0c97436686d0a61bc5fc113c037701fb7c7fceb96" +SRC_URI[sha256sum] = "dd1d3a8d1d2e50ad9b59e10aa7f07c7d1be2b367f3f2d33c5fade96ed5460962" RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn/run-ptest index 98d73fa037..5ca7e26e8a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn/run-ptest @@ -4,4 +4,4 @@ # ptests to work, so make sure there's at least one nameserver line echo "nameserver 8.8.8.8" >> /etc/resolv.conf -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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn_21.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn_21.2.0.bb index d765c8fd05..9fd601c999 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn_21.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn_21.2.0.bb @@ -12,9 +12,10 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-eventlet \ - ${PYTHON_PN}-gevent \ - ${PYTHON_PN}-pytest \ + python3-eventlet \ + python3-gevent \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { @@ -22,4 +23,4 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } -RDEPENDS:${PN} += "${PYTHON_PN}-setuptools ${PYTHON_PN}-fcntl" +RDEPENDS:${PN} += "python3-setuptools python3-fcntl" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb index 0c7b414d98..e45ae79860 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb @@ -2,7 +2,7 @@ SUMMARY = "Calculate the distance between 2 points on Earth" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI[sha256sum] = "cca39afd2ae5f1e6ed9231b332395bb8afb2e0a64edf70c238c176492e60c150" +SRC_URI[sha256sum] = "ab750caa0c8f2168bd7b00a429757a83a8393be1aa30f91c2becf6b523189e2a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb index 5b6d040368..d96f61bdc7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-html2text_2020.1.16.bb @@ -14,7 +14,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " RDEPENDS:${PN} += "python3-cgitb" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-httpcore_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-httpcore_1.0.2.bb new file mode 100644 index 0000000000..3bfe5ed4ae --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-httpcore_1.0.2.bb @@ -0,0 +1,26 @@ +SUMMARY = "A minimal low-level HTTP client." +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1c1f23b073da202e1f4f9e426490210c" + +inherit pypi python_hatchling + +SRC_URI[sha256sum] = "9fc092e4799b26174648e54b74ed5f683132a464e95643b226e00c2ed2fa6535" + +DEPENDS += "\ + python3-hatch-fancy-pypi-readme-native \ +" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[http2] = ",,,python3-h2" +PACKAGECONFIG[socks] = ",,,python3-socksio" +PACKAGECONFIG[asyncio] = ",,,python3-anyio" +# Don't provide "trio" PACKAGECONFIG as nothing provides "python3-trio" currently. +# If somebody needs this please feel free to add python3-trio and enable the +# packageconfig below: +#PACKAGECONFIG[trio] = ",,,python3-trio" + +RDEPENDS:${PN} += "\ + python3-certifi \ + python3-h11 \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-httpx_0.26.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-httpx_0.26.0.bb new file mode 100644 index 0000000000..9abd13e2be --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-httpx_0.26.0.bb @@ -0,0 +1,44 @@ +SUMMARY = "A next generation HTTP client for Python." +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c624803bdf6fc1c4ce39f5ae11d7bd05" + +inherit pypi python_hatchling + +SRC_URI[sha256sum] = "451b55c30d5185ea6b23c2c793abf9bb237d2a7dfb901ced6ff69ad37ec1dfaf" + +DEPENDS += "\ + python3-hatch-fancy-pypi-readme-native \ +" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[brotli] = ",,,python3-brotli" +PACKAGECONFIG[http2] = ",,,python3-h2" +PACKAGECONFIG[socks] = ",,,python3-socksio" + +RDEPENDS:${PN} += "\ + python3-anyio \ + python3-certifi \ + python3-httpcore \ + python3-idna \ + python3-sniffio \ +" + +PACKAGES += "\ + ${PN}-cli \ +" + +RDEPENDS:${PN}-cli += "\ + ${PN} \ + python3-click \ + python3-pygments \ + python3-rich \ +" + +FILES:${PN} = "\ + /usr/lib/python${PYTHON_BASEVERSION} \ +" + +FILES:${PN}-cli = "\ + /usr/bin/httpx \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.33.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.34.0.bb index 32b4472c6c..8653983ca7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.33.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.34.0.bb @@ -5,8 +5,8 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" -SRC_URI[sha256sum] = "78722d40b137bd98f5ec7312119f8aea9ad2049f76f434748eb306b6937cc1ce" +SRC_URI[sha256sum] = "ae9732e10acf807a22c389aef193f42215718e16bd06eed0c5bb57e1034a4d53" inherit pypi setuptools3 -RDEPENDS:${PN} = "python3-numpy python3-pillow" +RDEPENDS:${PN} = "${PYTHON_PN}-numpy ${PYTHON_PN}-pillow" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflection/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflection/run-ptest index 0caffb794c..f1c8729f0e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflection/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflection/run-ptest @@ -1,4 +1,4 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO test_inflection.py | 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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflection_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflection_0.5.1.bb index ea3b76d511..5c6f4e2356 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflection_0.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflection_0.5.1.bb @@ -13,8 +13,9 @@ SRC_URI +=" \ file://run-ptest \ " -RDEPENDS:${PN}_ptest +=" \ - ${PYTHON_PN}_pytest \ +RDEPENDS:${PN}-ptest +=" \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { @@ -22,6 +23,6 @@ do_install_ptest() { } -RDEPENDS:${PN} += "${PYTHON_PN}-pytest" +RDEPENDS:${PN} += "python3-pytest" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-inotify/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-inotify/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-inotify/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-inotify/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-inotify_git.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-inotify_git.bb index 2e189ddace..657f610bdd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-inotify_git.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-inotify_git.bb @@ -26,7 +26,8 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals/run-ptest index 357d8cb987..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO test_intervals.py| 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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb index abf87c597c..3c5be47806 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-intervals_1.10.0.bb @@ -14,7 +14,8 @@ SRC_URI += " \ inherit pypi setuptools3 ptest RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.01.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.01.bb index 8e7b5b987e..36d0b9ae27 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.01.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipy_1.01.bb @@ -19,7 +19,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.21.0.bb index 87474e4ed3..86e4c6454f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.19.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.21.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" PYPI_PACKAGE = "ipython" -SRC_URI[sha256sum] = "ac4da4ecf0042fb4e0ce57c60430c2db3c719fa8bdf92f8631d6bd8a5785d1f0" +SRC_URI[sha256sum] = "48fbc236fbe0e138b88773fa0437751f14c3645fb483f1d4c5dee58b37e5ce73" RDEPENDS:${PN} = "\ ${PYTHON_PN}-setuptools \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166_2.1.1.bb index b32cfe5956..3aa084d10a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166_2.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-iso3166_2.1.1.bb @@ -12,7 +12,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-janus_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-janus_1.0.0.bb new file mode 100644 index 0000000000..c709bcfbff --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-janus_1.0.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "Mixed sync-async queue to interoperate between asyncio tasks and classic threads" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=23878c357ebb4c8ce1109be365043349" + +SRC_URI[sha256sum] = "df976f2cdcfb034b147a2d51edfc34ff6bfb12d4e2643d3ad0e10de058cb1612" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} += "\ + python3-asyncio \ + python3-threading \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.3.bb index 08ee15a920..459726199e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonrpcclient_4.0.3.bb @@ -3,9 +3,12 @@ HOMEPAGE = "https://github.com/explodinglabs/jsonrpcclient" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=10f3d7679914df805c98fb351172e677" -SRC_URI[sha256sum] = "c0d475494b3e1b591ecdee7883739accaf5695edb673f16b7383b8c6bbdb1ca3" +SRCREV = "e5dd11736925a9a8e463fc9420eab95235f181e3" +SRC_URI = "git://github.com/explodinglabs/jsonrpcclient.git;branch=main;protocol=https" -inherit pypi setuptools3 +inherit python_setuptools_build_meta + +S = "${WORKDIR}/git" RDEPENDS:${PN} += "\ python3-json \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.4.2.bb index a50c9656ab..c2a18c0fd8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.4.2.bb @@ -2,11 +2,11 @@ SUMMARY = "A component library to support SBC display drivers" DESCRIPTION = "A component library to support SBC display drivers" HOMEPAGE = "https://github.com/rm-hull/luma.core" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=b56ff1acb787606580264498947079fc" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2083293a38df91b8d470d3fe30069262" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "175663a4b0afde86ed5359f265fbb2ed978132cac4d9b42a30a3e0f0faf3f0d7" +SRC_URI[sha256sum] = "963c264164d4374f549d57db09599e0ca458cea1bd05e16939897619be4e6dbd" PYPI_PACKAGE = "luma.core" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch new file mode 100644 index 0000000000..10acd7b8c1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus/0001-lib-python-remove-self-import-from-setup.py.patch @@ -0,0 +1,32 @@ +From 7490ac4629c7fe0dc329647e6e000d4bc13c610d Mon Sep 17 00:00:00 2001 +From: Richard Leitner <dev@g0hl1n.net> +Date: Wed, 24 Jan 2024 00:49:45 +0100 +Subject: [PATCH] lib: python: remove self-import from setup.py + +Importing moteus itself within the setup.py creates some kind of a +chicken-and-egg problem. Furthermore it isn't used anywhere within +setup.py. Therefore remove the corresponding import. + +Signed-off-by: Richard Leitner <dev@g0hl1n.net> + +Upstream-Status: Backport [https://github.com/mjbots/moteus/commit/7490ac4629c7fe0dc329647e6e000d4bc13c610d] +--- + setup.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 2731685..6c6064d 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,8 +17,6 @@ + import setuptools + import pathlib + +-import moteus +- + here = pathlib.Path(__file__).parent.resolve() + + # Get the long description from the README file +-- +2.40.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus_0.3.67.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus_0.3.67.bb new file mode 100644 index 0000000000..3c93ee44ff --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus_0.3.67.bb @@ -0,0 +1,19 @@ +SUMMARY = "moteus brushless controller library and tools" +HOMEPAGE = "https://github.com/mjbots/moteus" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=9;md5=24025d3c660abfc62a83f0e709a45e76" + +inherit pypi setuptools3 + +SRC_URI += "file://0001-lib-python-remove-self-import-from-setup.py.patch" + +SRC_URI[sha256sum] = "a2122f20f59b8962057cf8d3fb583e0aa19006eaf2cde49e30027a4d1b8bf925" + +S = "${WORKDIR}/moteus-${PV}" + +RDEPENDS:${PN} += "\ + python3-can \ + python3-importlib-metadata \ + python3-pyelftools \ + python3-pyserial \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict/run-ptest index e4f3b623ab..d74acaf564 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict/run-ptest @@ -1,2 +1,2 @@ #!/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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.4.bb index b057e05f65..19b94dee02 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.4.bb @@ -18,8 +18,9 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-cov \ + python3-pytest \ + python3-pytest-cov \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.10.1.bb index 15350e9426..ce16cc1787 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-netaddr_0.10.1.bb @@ -2,7 +2,7 @@ SUMMARY = "A network address manipulation library for Python." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e6345d695ffe3776f68a56fe7962db44" -SRC_URI[sha256sum] = "4c30c54adf4ea4318b3c055ea3d8c7f6554a50aa2cd8aea4605a23caa0b0229e" +SRC_URI[sha256sum] = "f4da4222ca8c3f43c8e18a8263e5426c750a3a837fdfeccf74c68d0408eaa3bf" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb index 99493db322..a7d8cd86ce 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb @@ -8,14 +8,15 @@ SRC_URI[sha256sum] = "79b1f2497060d0928bc46016793f1fca1057c4aacdf15ef876aa48d75a PYPI_PACKAGE = "parse_type" inherit pypi ptest setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-parse" +RDEPENDS:${PN} += "python3-parse" SRC_URI += " \ file://run-ptest \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb index 3ca6fbbeb2..610a966d40 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/r1chardj0n3s/parse" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" -SRC_URI[sha256sum] = "bd28bae37714b45d5894d77160a16e2be36b64a3b618c81168b3684676aa498b" +SRC_URI[sha256sum] = "09002ca350ad42e76629995f71f7b518670bcf93548bdde3684fd55d2be51975" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-path_16.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-path_16.10.0.bb index 19bf11b6c8..f95fce3b08 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-path_16.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-path_16.10.0.bb @@ -2,7 +2,7 @@ SUMMARY = "A module wrapper for os.path" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" -SRC_URI[sha256sum] = "dfd31c2af60e8889a13538bef302ade7adacdb5351836be22638e2349ddd5d7b" +SRC_URI[sha256sum] = "b32b22b76fe810a8ded6d136268cc8b6698ae7c47c29b94a9ea12623f3051e46" SRC_URI += "\ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.11.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.12.3.bb index f8a593c2b8..3361bb8338 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.11.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.12.3.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2" -SRC_URI[sha256sum] = "5b31255c48d4aca596c73fb872a82848cbe8ff92f008712a9a264455247063ee" +SRC_URI[sha256sum] = "53cdab727c1469fdc196efd8d7ff8404a3ca91ee43c0a5714736f2020d0a5ddf" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb index 1cc833e1ba..91b02ea017 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_10.1.0.bb @@ -27,9 +27,9 @@ DEPENDS += " \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-numbers \ + python3-misc \ + python3-logging \ + python3-numbers \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb', '', d)} \ " @@ -38,13 +38,14 @@ RDEPENDS:${PN}-ptest += " \ ghostscript \ jpeg-tools \ libwebp \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-image \ - ${PYTHON_PN}-mmap \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-timeout \ - ${PYTHON_PN}-resource \ - ${PYTHON_PN}-unixadmin\ + python3-core \ + python3-image \ + python3-mmap \ + python3-pytest \ + python3-pytest-timeout \ + python3-resource \ + python3-unittest-automake-output \ + python3-unixadmin\ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'tk', '', d)} \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_4.2.0.bb index b4fb9356c1..19c95b374a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_4.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_4.2.0.bb @@ -7,20 +7,21 @@ SRC_URI += " \ file://run-ptest \ " -SRC_URI[sha256sum] = "906d548203468492d432bcb294d4bc2fff751bf84971fbb2c10918cc206ee420" +SRC_URI[sha256sum] = "ef0cc731df711022c174543cb70a9b5bd22e5a9337c8624ef2c2ceb8ddad8768" inherit pypi python_hatchling ptest DEPENDS += " \ - ${PYTHON_PN}-hatch-vcs-native \ + python3-hatch-vcs-native \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-appdirs \ - ${PYTHON_PN}-covdefaults \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-mock \ - ${PYTHON_PN}-pytest-cov \ + python3-appdirs \ + python3-covdefaults \ + python3-pytest \ + python3-pytest-cov \ + python3-pytest-mock \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline_2.0.1.bb index 2eae0caf9c..4abe167f7b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-polyline_2.0.1.bb @@ -16,7 +16,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb index 9e5435bada..1fb72de126 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-precise-runner_0.3.1.bb @@ -13,7 +13,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb index c1e394d9b3..ba75057f59 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.9.0.bb @@ -20,22 +20,23 @@ SRC_URI += " \ " DEPENDS += "\ - ${PYTHON_PN}-hatch-vcs-native \ + python3-hatch-vcs-native \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-importlib-metadata \ + python3-math \ + python3-html \ + python3-wcwidth \ + python3-json \ + python3-compression \ + python3-importlib-metadata \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-lazy-fixture \ - ${PYTHON_PN}-sqlite3 \ + python3-pytest \ + python3-pytest-lazy-fixture \ + python3-sqlite3 \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest index 15c3f6282d..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess/run-ptest @@ -1,3 +1,3 @@ -#!/bin/sh +#!/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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb index 2a8b8730c4..4abec0a01c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ptyprocess_0.7.0.bb @@ -15,10 +15,10 @@ UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/ptyprocess" S = "${WORKDIR}/${SRCNAME}-${PV}" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-resource \ + python3-core \ + python3-fcntl \ + python3-terminal \ + python3-resource \ " BBCLASSEXTEND = "native nativesdk" @@ -30,11 +30,12 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-resource \ - bash \ + bash \ + python3-fcntl \ + python3-pytest \ + python3-resource \ + python3-terminal \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake 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 84172c058e..857afd1db7 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 @@ -17,7 +17,7 @@ SRC_URI += "file://run-ptest \ 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 + sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT done } @@ -28,6 +28,7 @@ do_install_ptest() { RDEPENDS:${PN}-ptest += "\ python3-pytest \ + python3-unittest-automake-output \ " RDEPENDS:${PN} += "python3-core python3-ctypes python3-datetime python3-json python3-io python3-mmap python3-multiprocessing python3-netclient python3-pickle python3-pprint python3-shell" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb index d158876fcd..ccd6025be1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.3.0.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "pyasn1_modules" inherit pypi ptest setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-pyasn1" +RDEPENDS:${PN} = "python3-pyasn1" BBCLASSEXTEND = "native nativesdk" @@ -21,7 +21,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.46.1.bb index cd0e12ec8e..2b6a6c2c0e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.46.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyatspi_2.46.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=db29218e6ba3794c56df7d4987dc7e4d \ DEPENDS = "python3-dbus-native glib-2.0 dbus-glib libxml2 atk gtk+ python3-pygobject" SRC_URI = "git://github.com/GNOME/pyatspi2.git;protocol=https;branch=master" -SRCREV = "c9cb2a2289a6eb1fb95b66c25d5351bfea54c47e" +SRCREV = "8c69016b38d0e4caaf4c986938ea3410fb7351b6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb index d51dd905a5..f94ef3637b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb @@ -1,19 +1,16 @@ SUMMARY = "Seamless operability between C++11 and Python" -HOMEPAGE = "https://github.com/wjakob/pybind11" -LICENSE = "BSD-2-Clause" +HOMEPAGE = "https://github.com/pybind/pybind11" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" -DEPENDS = "boost" - -SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https" - SRCREV = "8a099e44b3d5f85b20f05828d919d2332a8de841" +SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https" S = "${WORKDIR}/git" -EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" +inherit cmake setuptools3 -inherit cmake setuptools3 python3native +EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" PIP_INSTALL_DIST_PATH = "${S}/dist" PIP_INSTALL_PACKAGE = "pybind11" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb index 5e5f0c92f5..978fc0d4a6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb @@ -18,3 +18,5 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-cffi \ ${PYTHON_PN}-idna \ " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_13.0.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_13.1.0.bb index dff1876c3f..618aba4a67 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_13.0.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_13.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/balloob/pychromecast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b1dbd4e85f47b389bdadee9c694669f5" -SRC_URI[sha256sum] = "e4b7523db137f8de05eedcc6154113b68532848629442b448c2334fac966a447" +SRC_URI[sha256sum] = "08e61a8b54bd2119d3c9ab1ec0136d3d8563aa97e0a3b57841588b9be60c2676" PYPI_PACKAGE = "PyChromecast" @@ -16,4 +16,5 @@ RDEPENDS:${PN} += " \ ${PYTHON_PN}-requests \ ${PYTHON_PN}-protobuf \ ${PYTHON_PN}-compression \ + ${PYTHON_PN}-casttube \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/run-ptest index 2a4e87e03a..ed424cb879 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest --benchmark-disable -vv --minimal-messages-config tests/test_functional.py | 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}}' +pytest --benchmark-disable -vv --minimal-messages-config --automake tests/test_functional.py diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.3.bb index cc33edd829..eb4b9e897f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.0.3.bb @@ -10,34 +10,36 @@ SRCREV = "1a5ffc1f447b77071ffe18a9c6836c09147ee2ed" inherit python_setuptools_build_meta ptest -RDEPENDS:${PN} += "${PYTHON_PN}-astroid \ - ${PYTHON_PN}-dill \ - ${PYTHON_PN}-isort \ - ${PYTHON_PN}-mccabe \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-platformdirs \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-tomlkit \ - " +RDEPENDS:${PN} += "\ + python3-astroid \ + python3-difflib \ + python3-dill \ + python3-isort \ + python3-json \ + python3-mccabe \ + python3-netserver \ + python3-numbers \ + python3-pkgutil \ + python3-platformdirs \ + python3-shell \ + python3-tomlkit \ + " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-git \ - ${PYTHON_PN}-py \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-benchmark \ - ${PYTHON_PN}-pytest-runner \ - ${PYTHON_PN}-pytest-timeout \ - ${PYTHON_PN}-pytest-xdist \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-statistics \ - ${PYTHON_PN}-tomllib \ - ${PYTHON_PN}-typing-extensions \ - " + python3-core \ + python3-git \ + python3-py \ + python3-pytest \ + python3-pytest-benchmark \ + python3-pytest-runner \ + python3-pytest-timeout \ + python3-pytest-xdist \ + python3-requests \ + python3-statistics \ + python3-tomllib \ + python3-typing-extensions \ + python3-unittest-automake-output \ + " S = "${WORKDIR}/git" @@ -46,7 +48,7 @@ do_install_ptest() { 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 - # regression_distutil_import_error_73.py fails to run see + # regression_distutil_import_error_73.py fails to run see # https://lists.openembedded.org/g/openembedded-devel/topic/103181847 rm ${D}${PTEST_PATH}/tests/functional/r/regression_02/regression_distutil_import_error_73.py } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.183.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.184.bb index dec8186993..b0e62bae28 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.183.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.184.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[sha256sum] = "00abe5592f07bb1cd41ca803f9b0b8b2b70474004a779be53cd215280fd625b3" +SRC_URI[sha256sum] = "fbd9089c867a63144562932862474910696ab57f4786a4b7c1a0b28ba204c0ae" inherit python_poetry_core pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.6.3.bb index 4cd3801ee7..337fd0e190 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.6.3.bb @@ -1,13 +1,11 @@ SUMMARY = "A fully featured modbus protocol stack in python" HOMEPAGE = "https://github.com/riptideio/pymodbus/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6a146397c35e3d0953758ce8803de347" -DEPENDS += "python3-six-native" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eba8057aa82c058d2042b4b0a0e9cc63" -SRC_URI[sha256sum] = "26c1aa9919b24f2247794d5d9d80f65ec06fdfd9bd6b76b81d446b55335cabf3" -S = "${WORKDIR}/pymodbus-${PV}" +SRC_URI[sha256sum] = "862f64376ae201f979c91ca2398f0ed5df8f136b76491e0995edeebbd0fa8940" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta PACKAGECONFIG ??= "" PACKAGECONFIG[repl] = ",,,python3-aiohttp python3-click python3-prompt-toolkit python3-pygments python3-pyserial-asyncio" @@ -31,5 +29,3 @@ RDEPENDS:${PN} += " \ python3-pyserial \ python3-six \ " - - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2/run-ptest index ea429ba21e..f1c8729f0e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2/run-ptest @@ -1,4 +1,4 @@ #!/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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.10.bb index 6b340a18ce..740a6d7f73 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.10.bb @@ -27,9 +27,10 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - python3-pytest \ python3-fcntl \ + python3-pytest \ python3-sqlite3 \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial/run-ptest index e301963f96..b651411db7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial/run-ptest @@ -1,4 +1,4 @@ #!/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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb index 15646235df..ade137a385 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyserial_3.5.bb @@ -37,14 +37,14 @@ FILES:${PN}-win32 = " \ " RDEPENDS:${PN} = "\ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ + python3-fcntl \ + python3-io \ + python3-logging \ + python3-netclient \ + python3-numbers \ + python3-shell \ + python3-stringold \ + python3-threading \ " BBCLASSEXTEND = "native nativesdk" @@ -54,7 +54,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.4.bb index 85f69ac3ab..6def541872 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "pytest-asyncio is an Apache2 licensed library, written in Python, LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=136e4f49dbf29942c572a3a8f6e88a77" -SRC_URI[sha256sum] = "af313ce900a62fbe2b1aed18e37ad757f1ef9940c6b6a88e2954de38d6b1fb9f" +SRC_URI[sha256sum] = "2143d9d9375bf372a73260e4114541485e84fca350b0b6b92674ca56ff5f7ea2" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb index 32b5677f1a..9c50528fb0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb @@ -20,4 +20,7 @@ do_install_ptest() { RDEPENDS:${PN} += "python3-core python3-pytest" -RDEPENDS:${PN}-ptest = " python3-unixadmin" +RDEPENDS:${PN}-ptest = " \ + python3-unixadmin \ + python3-unittest-automake-output \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch new file mode 100644 index 0000000000..6787c2a3dc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch @@ -0,0 +1,92 @@ +From 8480bb6d0500f933be039cfec65e04157e6ecffe Mon Sep 17 00:00:00 2001 +From: Bruno Oliveira <nicoddemus@gmail.com> +Date: Tue, 19 Dec 2023 08:24:23 -0300 +Subject: [PATCH 1/3] Fix tests for Python 3.11 and 3.12 + +Fixes #401. +Upstream-Status: Backport [https://github.com/pytest-dev/pytest-mock/pull/403] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/test_pytest_mock.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py +index 3ee00da..7acb361 100644 +--- a/tests/test_pytest_mock.py ++++ b/tests/test_pytest_mock.py +@@ -246,9 +246,8 @@ def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: + msg = "Expected call: {0}()\nNot called" + expected_message = msg.format(expected_name) + stub = mocker.stub(**kwargs) +- with pytest.raises(AssertionError) as exc_info: ++ with pytest.raises(AssertionError, match=re.escape(expected_message)) as exc_info: + stub.assert_called_with() +- assert str(exc_info.value) == expected_message + + def test_failure_message_with_no_name(self, mocker: MagicMock) -> None: + self.__test_failure_message(mocker) + +From c596504e062be06475b03122c9c0cc732ae87840 Mon Sep 17 00:00:00 2001 +From: "pre-commit-ci[bot]" + <66853113+pre-commit-ci[bot]@users.noreply.github.com> +Date: Tue, 19 Dec 2023 11:24:38 +0000 +Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks + +for more information, see https://pre-commit.ci +--- + tests/test_pytest_mock.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py +index 7acb361..c185f2a 100644 +--- a/tests/test_pytest_mock.py ++++ b/tests/test_pytest_mock.py +@@ -246,7 +246,9 @@ def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: + msg = "Expected call: {0}()\nNot called" + expected_message = msg.format(expected_name) + stub = mocker.stub(**kwargs) +- with pytest.raises(AssertionError, match=re.escape(expected_message)) as exc_info: ++ with pytest.raises( ++ AssertionError, match=re.escape(expected_message) ++ ) as exc_info: + stub.assert_called_with() + + def test_failure_message_with_no_name(self, mocker: MagicMock) -> None: + +From 6da5b0506d6378a8dbe5ae314d5134e6868aeabd Mon Sep 17 00:00:00 2001 +From: danigm <daniel.garcia@suse.com> +Date: Wed, 20 Dec 2023 16:02:13 +0100 +Subject: [PATCH 3/3] Update expected message to match python 3.11.7 (#404) + +https://github.com/python/cpython/issues/111019 + +Fixes #401. +Closes #403. +--- + tests/test_pytest_mock.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py +index c185f2a..01534a4 100644 +--- a/tests/test_pytest_mock.py ++++ b/tests/test_pytest_mock.py +@@ -25,6 +25,8 @@ + + # Python 3.8 changed the output formatting (bpo-35500), which has been ported to mock 3.0 + NEW_FORMATTING = sys.version_info >= (3, 8) ++# Python 3.11.7 changed the output formatting, https://github.com/python/cpython/issues/111019 ++NEWEST_FORMATTING = sys.version_info >= (3, 11, 7) + + if sys.version_info[:2] >= (3, 8): + from unittest.mock import AsyncMock +@@ -240,7 +242,9 @@ def test_repr_with_name(self, mocker: MockerFixture) -> None: + + def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: + expected_name = kwargs.get("name") or "mock" +- if NEW_FORMATTING: ++ if NEWEST_FORMATTING: ++ msg = "expected call not found.\nExpected: {0}()\n Actual: not called." ++ elif NEW_FORMATTING: + msg = "expected call not found.\nExpected: {0}()\nActual: not called." + else: + msg = "Expected call: {0}()\nNot called" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.12.0.bb index ac6f8e8313..e9a9a4fbc5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.12.0.bb @@ -9,21 +9,20 @@ 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 \ + file://403.patch \ " - SRCREV = "69adc6f76c1a7baf4e7a728da9eec38741d5783e" -SRC_URI[sha256sum] = "fbbdb085ef7c252a326fd8cdcac0aa3b1333d8811f131bdcc701002e1be7ed4f" - inherit setuptools3 ptest -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += " \ python3-asyncio \ python3-pytest \ python3-pytest-asyncio \ python3-unittest \ + python3-unittest-automake-output \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb index 0f04a12039..1717085967 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytoml_0.1.21.bb @@ -16,12 +16,13 @@ SRC_URI += " \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-stringold \ + python3-datetime \ + python3-stringold \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb new file mode 100644 index 0000000000..6992ca24cc --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb @@ -0,0 +1,8 @@ +SUMMARY = "Unicode normalization forms (NFC, NFKC, NFD, NFKD). A library independent from the Python core Unicode database." +HOMEPAGE = "https://github.com/mlodewijck/pyunormalize" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dc15b678c3bac1f5b2c873591a330eae" + +SRC_URI[sha256sum] = "cf4a87451a0f1cb76911aa97f432f4579e1f564a2f0c84ce488c73a73901b6c1" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest new file mode 100755 index 0000000000..8d2017d39c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb new file mode 100644 index 0000000000..3a5bd99a78 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include_1.3.2.bb @@ -0,0 +1,29 @@ +SUMMARY = "Extending PyYAML with a custom constructor for including YAML files within YAML files" +HOMEPAGE = "https://github.com/tanbro/pyyaml-include" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" +DEPENDS += "python3-setuptools-scm-native" +SRCREV = "36b6975aa8fc7a6cbf37de40aa2ed6d996b2f7be" + +SRC_URI = " \ + git://github.com/tanbro/pyyaml-include;protocol=https;branch=main \ + file://run-ptest \ + " + +S = "${WORKDIR}/git" + +inherit python_setuptools_build_meta ptest + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS:${PN} += " \ + python3-pyyaml \ +" +RDEPENDS:${PN}-ptest += " \ + python3-pytest \ + python3-unittest-automake-output \ +" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.2.bb index 658dbe6e25..5793db55f6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzmq_25.1.2.bb @@ -26,13 +26,14 @@ FILES:${PN}-test += "\ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-multiprocessing \ + python3-json \ + python3-multiprocessing \ " RDEPENDS:${PN}-ptest += "\ - ${PN}-test \ - ${PYTHON_PN}-pytest \ + ${PN}-test \ + python3-pytest \ + python3-unittest-automake-output \ " do_compile:prepend() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb index 21cdb8c127..7ff984a933 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb @@ -13,7 +13,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_1.0.0.bb index 2534c1c62c..9cbe4927a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_1.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-toolbelt_1.0.0.bb @@ -14,15 +14,16 @@ SRC_URI[sha256sum] = "7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c8 inherit pypi setuptools3 ptest RDEPENDS:${PN} += " \ - ${PYTHON_PN}-requests (>=2.0.1) \ + python3-requests (>=2.0.1) \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-betamax \ - ${PYTHON_PN}-mock \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-trustme \ + python3-betamax \ + python3-mock \ + python3-multiprocessing \ + python3-pytest \ + python3-trustme \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_6.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb index 7fd2f2e888..ca301e46a4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_6.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb @@ -13,7 +13,7 @@ inherit pypi setuptools3 PYPI_PACKAGE_EXT = "zip" -SRC_URI[sha256sum] = "3fa18f2596a4df2418c4b59abf43248327c15ed38ad8665f6a9a9c75c95d7789" +SRC_URI[sha256sum] = "04623f758346c917db182e17591ffa474090560c02ed5a64343902e72b7b4bd5" RDEPENDS:${PN} += " \ ${PYTHON_PN}-shell \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.16.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.16.7.bb deleted file mode 100644 index c033c56bad..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.16.7.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Improved build system generator for Python C/C++/Fortran/Cython extensions" -LICENSE = "MIT & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7c96d2b08b3cec6d3c67fb864d1fd8cc" - -DEPENDS = "python3-setuptools-scm-native" - -PYPI_PACKAGE = "scikit-build" - -inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "a9b9cc7479b71e6c8d434596dfade025253aae23adb22a9a2d85850fd51cecfd" - -RDEPENDS:${PN} = " \ - python3-distro \ - python3-packaging \ - python3-setuptools \ - python3-typing-extensions \ - python3-wheel \ - cmake \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.17.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.17.6.bb new file mode 100644 index 0000000000..7f99dd16b8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.17.6.bb @@ -0,0 +1,22 @@ +SUMMARY = "Improved build system generator for Python C/C++/Fortran/Cython extensions" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7c96d2b08b3cec6d3c67fb864d1fd8cc" + +DEPENDS = "${PYTHON_PN}-hatch-vcs-native ${PYTHON_PN}-hatch-fancy-pypi-readme-native" + +PYPI_PACKAGE = "scikit_build" + +inherit pypi python_hatchling + +SRC_URI[sha256sum] = "b51a51a36b37c42650994b5047912f59b22e3210b23e321f287611f9ef6e5c9d" + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-distro \ + ${PYTHON_PN}-packaging \ + ${PYTHON_PN}-setuptools \ + ${PYTHON_PN}-typing-extensions \ + ${PYTHON_PN}-wheel \ + cmake \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb index c386932683..ce0d4de9c4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-scrypt_0.8.20.bb @@ -14,11 +14,12 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ctypes \ + python3-ctypes \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest index cd2bc8537c..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO tests/test_semver.py --disable-warnings| 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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_3.0.2.bb index f90ea0c9dc..25222bb5ff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-semver_3.0.2.bb @@ -17,7 +17,8 @@ SRC_URI += " \ DEPENDS += " python3-setuptools-scm-native" RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.39.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.40.0.bb index 9f421328b9..ec59c712ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.39.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.40.0.bb @@ -15,7 +15,7 @@ RDEPENDS:${PN} += "\ ${PYTHON_PN}-datetime \ " -SRC_URI[sha256sum] = "320a55cdf9da9097a0bead239c35b7e61f53660ef9878861824fd6d9b2eaf3b5" +SRC_URI[sha256sum] = "34ad8cfc9b877aaa2a8eb86bfe5296a467fffe0619b931a05b181c45f6da59bf" PYPI_PACKAGE = "sentry-sdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb index 480e3ab388..941b5ee0f3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb @@ -11,8 +11,9 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytz \ + python3-pytest \ + python3-pytz \ + python3-unittest-automake-output \ " do_install_ptest() { @@ -21,6 +22,6 @@ do_install_ptest() { } RDEPENDS:${PN} += "\ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ -" + python3-netclient \ + python3-numbers \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb index c3c26dda38..0a2f2728b7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb @@ -20,7 +20,8 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb index 35cd19ffef..af2c4a1e2e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simpleeval_0.9.13.bb @@ -12,11 +12,12 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI += "file://run-ptest" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-math \ + python3-math \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.2.3.bb index 25f8f6afdd..7979f04c5b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smpplib_2.2.3.bb @@ -13,15 +13,16 @@ SRC_URI += " \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ + python3-logging \ + python3-six \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unittest \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-mock \ + python3-mock \ + python3-profile \ + python3-pytest \ + python3-unittest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sniffio_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sniffio_1.3.0.bb new file mode 100644 index 0000000000..448ac34f54 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sniffio_1.3.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "Sniff out which async library your code is running under" +SECTION = "devel/python" +LICENSE = "MIT | Apache-2.0" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=fa7b86389e58dd4087a8d2b833e5fe96 \ + file://LICENSE.MIT;md5=e62ba5042d5983462ad229f5aec1576c \ + file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \ +" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socksio/0001-Unpin-flit-core-dependency.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-socksio/0001-Unpin-flit-core-dependency.patch new file mode 100644 index 0000000000..75be61fc4f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socksio/0001-Unpin-flit-core-dependency.patch @@ -0,0 +1,21 @@ +From 5c50fd76e7459bb822ff8f712172a78e21b8dd04 Mon Sep 17 00:00:00 2001 +From: Theodore Ni <3806110+tjni@users.noreply.github.com> +Date: Sun, 13 Aug 2023 09:21:49 -0700 +Subject: [PATCH] Unpin flit-core dependency + +Upstream-Status: Submitted [https://github.com/sethmlarson/socksio/pull/61] +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 2d6c5a3..60c63ea 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["flit_core >=2,<3"] ++requires = ["flit_core >=2"] + build-backend = "flit_core.buildapi" + + [tool.flit.metadata] diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socksio_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socksio_1.0.0.bb new file mode 100644 index 0000000000..4353a52ee1 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socksio_1.0.0.bb @@ -0,0 +1,10 @@ +SUMMARY = "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5." +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0b4dda8edb09eec767aaded3cbf8f6b1" + +inherit pypi python_flit_core + +SRC_URI += "file://0001-Unpin-flit-core-dependency.patch" + +SRC_URI[sha256sum] = "f88beb3da5b5c38b9890469de67d0cb0f9d494b78b106ca1845f96c10b91c4ac" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.5.bb index 42c07fb4cb..d26a13dfbd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.5.bb @@ -13,8 +13,9 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-beautifulsoup4 \ + python3-beautifulsoup4 \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb index e4ac403eb5..c04971ee8f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb @@ -16,8 +16,9 @@ export HOST_SYS inherit pypi ptest python_flit_core RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unixadmin \ + python3-pytest \ + python3-unittest-automake-output \ + python3-unixadmin \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-strenum/0001-patch-versioneer-for-python-3.12-compatibility.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-strenum/0001-patch-versioneer-for-python-3.12-compatibility.patch new file mode 100644 index 0000000000..cdf3f1acb7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-strenum/0001-patch-versioneer-for-python-3.12-compatibility.patch @@ -0,0 +1,37 @@ +From 3a71c9bc3747201e5bebe0e80b98ac6219209875 Mon Sep 17 00:00:00 2001 +From: alperak <alperyasinak1@gmail.com> +Date: Thu, 8 Feb 2024 14:09:32 +0300 +Subject: [PATCH] Patch versioneer for Python 3.12 compatibility + +AttributeError: 'ConfigParser' object has no attribute 'readfp'. Did you mean: 'read'? +AttributeError: module 'configparser' has no attribute 'SafeConfigParser'. Did you mean: 'RawConfigParser'? + +readfp and SafeConfigParser has been deprecated since Python 3.2 and removed in Python 3.12 (due October 2023). Use read_file and ConfigParser instead. + +https://docs.python.org/3/whatsnew/3.12.html#configparser + +Upstream-Status: Submitted [https://github.com/irgeek/StrEnum/pull/34] +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + versioneer.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/versioneer.py b/versioneer.py +index 64fea1c..3aa5da3 100644 +--- a/versioneer.py ++++ b/versioneer.py +@@ -339,9 +339,9 @@ def get_config_from_root(root): + # configparser.NoOptionError (if it lacks "VCS="). See the docstring at + # the top of versioneer.py for instructions on writing your setup.cfg . + setup_cfg = os.path.join(root, "setup.cfg") +- parser = configparser.SafeConfigParser() ++ parser = configparser.ConfigParser() + with open(setup_cfg, "r") as f: +- parser.readfp(f) ++ parser.read_file(f) + VCS = parser.get("versioneer", "VCS") # mandatory + + def get(parser, name): +-- +2.25.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-strenum_0.4.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-strenum_0.4.15.bb new file mode 100644 index 0000000000..aa85189ee5 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-strenum_0.4.15.bb @@ -0,0 +1,14 @@ +SUMMARY = "An Enum that inherits from str" +HOMEPAGE = "https://github.com/irgeek/StrEnum" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ba0eb3de1df70bde0ed48488cfd81269" + +SRC_URI += "file://0001-patch-versioneer-for-python-3.12-compatibility.patch" + +DEPENDS = "${PYTHON_PN}-pytest-runner-native" + +SRC_URI[sha256sum] = "878fb5ab705442070e4dd1929bb5e2249511c0bcf2b0eeacf3bcd80875c82eff" + +PYPI_PACKAGE = "StrEnum" + +inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.3.bb index 89acd77770..d4162a110b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.3.bb @@ -18,9 +18,10 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-poetry-core \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pyyaml \ + python3-poetry-core \ + python3-pytest \ + python3-pyyaml \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.12.1.bb index 4025fa3e0e..f1763ee518 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-toolz_0.12.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca09cab178326d18433aae982d1edf5d" -SRC_URI[sha256sum] = "88c570861c440ee3f2f6037c4654613228ff40c93a6c25e0eba70d17282c6194" +SRC_URI[sha256sum] = "ecca342664893f177a13dac0e6b41cbd8ac25a358e5f215316d43e2100224f4d" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.11.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.12.1.bb index 62c15a7db3..6d092c6ffe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.11.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.12.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://tox.readthedocs.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" -SRC_URI[sha256sum] = "73a7240778fabf305aeb05ab8ea26e575e042ab5a18d71d0ed13e343a51d6ce1" +SRC_URI[sha256sum] = "61aafbeff1bd8a5af84e54ef6e8402f53c6a6066d0782336171ddfbf5362122e" BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb index e925712f36..ac03bce2b0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb @@ -20,9 +20,10 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-service-identity \ - ${PYTHON_PN}-pyasn1-modules \ + python3-pyasn1-modules \ + python3-pytest \ + python3-service-identity \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_4.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_4.1.5.bb index 53a02dc4bc..000620ef73 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_4.1.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typeguard_4.1.5.bb @@ -17,9 +17,10 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-typing-extensions \ - ${PYTHON_PN}-unixadmin \ + python3-pytest \ + python3-typing-extensions \ + python3-unittest-automake-output \ + python3-unixadmin \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240205.bb index 055cecd640..736024d45d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.17.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240205.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1 inherit pypi setuptools3 -SRC_URI[sha256sum] = "f7d8769812d72a4b513d7ec9eb5580fe2f6013fc270394a603cb6534811f3e4d" +SRC_URI[sha256sum] = "51df36a361aa597bf483dcc5b58f2ab7aa87452a36d2da97c90994d6a81ef743" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_69.0.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_69.0.0.20240125.bb index 2fc1895b01..7e15dcb13a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_69.0.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_69.0.0.20240125.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1 inherit pypi setuptools3 -SRC_URI[sha256sum] = "b0a06219f628c6527b2f8ce770a4f47550e00d3e8c3ad83e2dc31bc6e6eda95d" +SRC_URI[sha256sum] = "22ad498cb585b22ce8c97ada1fccdf294a2e0dd7dc984a28535a84ea82f45b3f" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.2.bb index 866a7a78c5..da58964f2c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzlocal_5.2.bb @@ -10,4 +10,5 @@ inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ python3-datetime \ python3-logging \ + python3-zoneinfo \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python/run-ptest index 7110f6bc40..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO test_umsgpack.py| 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}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.8.0.bb index 8baedcb951..6cde243fe8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-u-msgpack-python_2.8.0.bb @@ -12,7 +12,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { @@ -20,7 +21,7 @@ do_install_ptest() { } RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ + python3-datetime \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest index b1539453a6..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -python3 tests/test_ujson.py +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.9.0.bb index 8de9b030dd..b5f6be9f27 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.9.0.bb @@ -13,17 +13,18 @@ SRC_URI += " \ file://0001-setup.py-Do-not-strip-debugging-symbols.patch \ " -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-numbers \ + python3-datetime \ + python3-numbers \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytz \ + python3-json \ + python3-pytest \ + python3-pytz \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.5.bb index 690acf8634..d77252beac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-unidiff_0.7.5.bb @@ -12,7 +12,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { @@ -21,6 +22,6 @@ do_install_ptest() { } RDEPENDS:${PN} += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-io \ + python3-codecs \ + python3-io \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-uritemplate/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-uritemplate/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-uritemplate/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-uritemplate/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-uritemplate_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-uritemplate_4.1.1.bb index 3c41b1eb4f..e741b6268d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-uritemplate_4.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-uritemplate_4.1.1.bb @@ -14,7 +14,8 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_3.0.0.bb index 061586b5df..7470fc02a0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_2.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-waitress_3.0.0.bb @@ -10,6 +10,6 @@ RDEPENDS:${PN} += " \ python3-logging \ " -SRC_URI[sha256sum] = "780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba" +SRC_URI[sha256sum] = "005da479b04134cdd9dd602d1ee7c49d79de0537610d653674cc6cbde222b8a1" inherit python_setuptools_build_meta pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.14.0.bb deleted file mode 100644 index 177c6fc030..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.14.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A Python library for interacting with Ethereum." -HOMEPAGE = "https://github.com/ethereum/web3.py" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" - -SRC_URI[sha256sum] = "a3726289da9eff2ce30f9b1b49ec59e9245216f7aecbfa2007f73dbe94999717" - -inherit pypi setuptools3 - -RDEPENDS:${PN} += " \ - python3-aiohttp \ - python3-eth-account \ - python3-idna \ - python3-jsonschema \ - python3-google-api-core \ - python3-lru-dict \ - python3-requests \ - python3-setuptools \ - python3-websockets \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.15.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.15.1.bb new file mode 100644 index 0000000000..00b19bb240 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.15.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "A Python library for interacting with Ethereum." +HOMEPAGE = "https://github.com/ethereum/web3.py" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" + +SRC_URI[sha256sum] = "f9e7eefc1b3c3d194868a4ef9583b625c18ea3f31a48ebe143183db74898f381" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + ${PYTHON_PN}-aiohttp \ + ${PYTHON_PN}-eth-abi \ + ${PYTHON_PN}-eth-account \ + ${PYTHON_PN}-eth-hash \ + ${PYTHON_PN}-eth-typing \ + ${PYTHON_PN}-eth-utils \ + ${PYTHON_PN}-hexbytes \ + ${PYTHON_PN}-jsonschema \ + ${PYTHON_PN}-protobuf \ + ${PYTHON_PN}-pydantic \ + ${PYTHON_PN}-requests \ + ${PYTHON_PN}-typing-extensions \ + ${PYTHON_PN}-websockets \ + ${PYTHON_PN}-pyunormalize \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb index 11441fca2b..0c3308d650 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_2.3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb @@ -1,4 +1,4 @@ -SUMMARY = "The Swiss Army knife of Python web development" +SUMMARY = "The comprehensive WSGI web application library" DESCRIPTION = "\ Werkzeug started as simple collection of various utilities for WSGI \ applications and has become one of the most advanced WSGI utility modules. \ @@ -6,35 +6,18 @@ It includes a powerful debugger, full featured request and response objects, \ HTTP utilities to handle entity tags, cache control headers, HTTP dates, \ cookie handling, file uploads, a powerful URL routing system and a bunch \ of community contributed addon modules." -HOMEPAGE = "http://werkzeug.pocoo.org/" +HOMEPAGE = "https://werkzeug.palletsprojects.com" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" -PYPI_PACKAGE = "Werkzeug" +SRC_URI[sha256sum] = "507e811ecea72b18a404947aded4b3390e1db8f826b494d76550ef45bb3b1dcc" -SRC_URI[sha256sum] = "98c774df2f91b05550078891dee5f0eb0cb797a522c757a2452b9cee5b202330" - -inherit pypi python_setuptools_build_meta - -CLEANBROKEN = "1" +inherit pypi python_flit_core RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ + ${PYTHON_PN}-markupsafe \ ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-simplejson \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-misc \ ${PYTHON_PN}-profile \ - ${PYTHON_PN}-markupsafe \ + ${PYTHON_PN}-compression \ + ${PYTHON_PN}-json \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-whitenoise_6.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-whitenoise_6.6.0.bb new file mode 100644 index 0000000000..352a53769a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-whitenoise_6.6.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "Radically simplified static file serving for WSGI applications" +AUTHOR = "David Evans <d@evans.io>" +HOMEPAGE = "https://whitenoise.evans.io" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=aba4901cc64e401cea5a267eac2a2e1e" + +PYPI_PACKAGE = "whitenoise" + +SRC_URI[sha256sum] = "8998f7370973447fac1e8ef6e8ded2c5209a7b1f67c1012866dbcd09681c3251" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN}:append = " \ + python3-brotli \ + python3-coverage \ + python3-django \ + python3-pytest \ + python3-requests \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb index ed2a6d423f..38d3e1cecd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-whoosh_2.7.4.bb @@ -16,13 +16,13 @@ PYPI_PACKAGE_EXT = "zip" inherit ptest pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ + python3-email \ + python3-multiprocessing \ + python3-netclient \ + python3-numbers \ + python3-pickle \ + python3-shell \ + python3-stringold \ " SRC_URI += " \ @@ -30,8 +30,9 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-fcntl \ + python3-fcntl \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb index 5e63d3c307..8a9af14d3e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlrd_2.0.1.bb @@ -30,6 +30,7 @@ RDEPENDS:${PN} += " \ RDEPENDS:${PN}-ptest += " \ python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_2.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.0.1.bb index 19fae91315..890743b0c4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_2.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.0.1.bb @@ -1,9 +1,9 @@ SUMMARY = "The xmlschema library is an implementation of XML Schema for Python (supports Python 3.6+)." HOMEPAGE = "https://github.com/sissaschool/xmlschema" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0ab20f8e337bea2e6874f372edfd12c0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=26aa26eda991a3a2b61c11b62d3fda65" -SRC_URI[sha256sum] = "4f7497de6c8b6dc2c28ad7b9ed6e21d186f4afe248a5bea4f54eedab4da44083" +SRC_URI[sha256sum] = "bb24a5f4738e49d85d9eb03a2b5af26bbbbfdb055517ad953d98925094b8c026" PYPI_PACKAGE = "xmlschema" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash/run-ptest index e398fa8ca0..72c918c1a1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest tests/test.py -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}}' +pytest --automake tests/test.py diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb index 4050d12eb9..be9ce005ea 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb @@ -14,7 +14,8 @@ SRC_URI += " \ inherit pypi python_setuptools_build_meta ptest RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl/run-ptest index 3385d68939..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.9.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.9.4.bb index d9fe4c0c4c..29897b7f1c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.9.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.9.4.bb @@ -12,18 +12,19 @@ PYPI_PACKAGE = "yarl" inherit pypi ptest python_setuptools_build_meta DEPENDS += " \ - ${PYTHON_PN}-expandvars-native \ - ${PYTHON_PN}-cython-native \ + python3-expandvars-native \ + python3-cython-native \ " RDEPENDS:${PN} = "\ - ${PYTHON_PN}-multidict \ - ${PYTHON_PN}-idna \ - ${PYTHON_PN}-io \ + python3-multidict \ + python3-idna \ + python3-io \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.4.bb b/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.4.bb deleted file mode 100644 index 920ff4d69d..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_5.12.4.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Google Spreadsheets Python API" -HOMEPAGE = "https://github.com/burnash/gspread" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9488e21983675fa56dc05af558b83e2f" - -SRC_URI[sha256sum] = "3fcef90183f15d3c9233b4caa021a83682f2b2ee678340c42d7ca7d8be98c6d1" - -S = "${WORKDIR}/gspread-${PV}" - -RDEPENDS:${PN} = "python3-requests" - -inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.0.1.bb new file mode 100644 index 0000000000..7854b7562c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python3-gspread/python3-gspread_6.0.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "Google Spreadsheets Python API" +HOMEPAGE = "https://github.com/burnash/gspread" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9488e21983675fa56dc05af558b83e2f" + +SRC_URI[sha256sum] = "8c8bf83be676a019d3a483455d8b17b442f2acfc620172f245422ca4fc960dd0" + +RDEPENDS:${PN} = " \ + ${PYTHON_PN}-google-auth \ + ${PYTHON_PN}-google-auth-oauthlib \ + ${PYTHON_PN}-strenum \ + " + +inherit pypi python_flit_core diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index 040788609e..4dbf595c19 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/jchampio/apache-websocket.git;branch=master;protocol SRCREV = "0ee34c77fc78ff08fd548706300b80a7bc7874e4" -PV = "0.1.2+git${SRCPV}" +PV = "0.1.2+git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb index 3dc4ca8bbb..7763a31881 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRCREV = "9a75e65b876bcc376cb6b379dca1f7ce4a055c59" -PV = "1.2.104+git${SRCPV}" +PV = "1.2.104+git" SRC_URI = "git://github.com/cherokee/webserver;branch=master;protocol=https \ file://cherokee.init \ file://cherokee.service \ |