diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2024-03-01 17:54:02 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2024-03-01 19:12:33 +0300 |
| commit | 396535664c5645a0b32bd0e06dbab3f1e2849b64 (patch) | |
| tree | dcf5c28dc344e5906f266d9644e0cfab226134a0 /meta-openembedded | |
| parent | 73bd93f1d0a338767f36fd1acb54c52ad057db39 (diff) | |
| download | openbmc-396535664c5645a0b32bd0e06dbab3f1e2849b64.tar.xz | |
subtree updates
meta-arm: 025f76a14f..aba9250494:
Anusmita Dutta Mazumder (2):
arm-bsp/linux-yocto: Remove EOL Linux yocto kernel 6.1
arm-bsp/n1sdp: update to linux yocto kernel 6.6
Bence Balogh (1):
arm-bsp/trusted-firmware-m: disable libmetal doc generation
Drew Reed (5):
meta-arm: Support firmware building under a multiconfig
bsp,ci: Build Corstone-1000 firmware under multiconfig
bsp: Restore the ability to build firmware only
ci: Add back testing of firmware only builds
ci: Ensure tests are in the Corstone-1000 flash image
meta-raspberrypi: dbf1113a82..95a9103f91:
Khem Raj (1):
python3-sense-hat: Drop PYTHON_PN
Martin Jansa (2):
sdcard_image-rpi.bbclass: include ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and ${IMAGE_LINK_NAME}
sdimage-raspberrypi.wks: increase /boot partition minimal size from 20 to 100
meta-openembedded: 528f273006..9f0e513211:
Andreas Mützel (1):
python3-pynacl: allow -native build
Chen Qi (1):
unixodbc: fix odbc.pc file generation
Daniel Ammann (1):
sdmon: add new package
Derek Straka (9):
python3-trustme: add runtime dependency for tests and re-add to ptest
python3-gunicorn: re-enable working ptests for the package
python-inotify: re-enable working ptests for the package
python3-license-expression: re-enable passing ptests for the package
python3-jdcal: re-add functional ptests
python3-msgpack: re-add functional ptests
python3-parse: re-add functional ptests
python3-typeguard: update ptest dependencies and re-enable functional tests
python3-service-identity: add missing ptest dependencies and re-enable functional tests
Jan Vermaete (1):
netdata: version bump 1.43.2 -> 1.44.3
Joerg Hofrichter (1):
python3-gevent: adding missing dependency to python3-zopeevent
Khawaja Shaheryar (2):
libdaq: add recipe
snort: add snort3 initial recipe
Khem Raj (25):
python3-pocketsphinx: Upgrade to 5.0.3
snort: Do not use llvm libunwind
snort3: Fix contains reference to TMPDIR [buildpaths] warnings
libcamera: Replace VLAs with alloca
dav1d: Inherit missing pkgconfig
webkitgtk3: Fix build on 32bit x86
ptest-packagelists-meta-oe: Remove oprofile for rv32/rv64
python3-jsmin: Fix ptests to run with python 3.12+
python3-ordered-set: Use automake formatter for ptest output
fuse3: Add missing runtime deps for ptests
python3-looseversion: Add recipe
sshfs-fuse: Fix ptest builds with python 3.12
meta-filesystems: Add meta-filesystems-image-ptest
meta-multimedia-image-ptest: Add images to enable BBCLASSEXTEND parallel execution
meta-networking-image-ptest: Add images to enable BBCLASSEXTEND parallel execution
python3-scapy: Add missing rdeps for ptests
ptest-packagelists-meta-oe.inc: Remove oprofile from PTESTS_PROBLEMS_META_OE
ptest-packagelists-meta-networking: firewalld hangs therefore disabled
ptest-packagelists-meta-perl.inc: Move couple of test to PTESTS_FAST_META_PERL
openhpi: Fix ptest run time failures
squid: Add missing bash dependency for ptest package
meta-networking: Express dependency on meta-python
ostree: Remove strace from ptest rdeps
python3-pydantic-core,python3-pydantic: Update to 2.16.3 and 2.6.3 respectively
python3-pydantic-core: Fix build for arches without 64bit atomics
Lei Maohui (1):
Fix install error when enable multilib.
Markus Volk (7):
iwd: update 2.13 -> 2.14
libgedit-gtksourceview: update 299.0.5 -> 299.1.0
gedit: update 46.1 -> 46.2
mutter: update 45.3 -> 45.4
gnome-shell: update 45.3 -> 45.4
gnome-control-center: update 45.2 -> 45.3
dav1d: update 1.3.0 -> 1.4.0
Martin Jansa (5):
python3-httpx: respect libdir in packaging
snort3: drop SRCPV from PV
snort3: fix snort.pc
gattlib: use python3native and depend on python3-packaging-native
networkmanager-fortisslvpn: use python3native and depend on python3-packaging-native
Mingli Yu (1):
mariadb: Upgrade to 10.11.7
Niko Mauno (2):
python3-pybind11: Migrate to python_setuptools_build_meta
python3-pybind11: Restore strip prevention patch
Oleh Matiusha (1):
yasm: improve reproducibility
Peter Marko (1):
dnsmasq: Upgrade 2.89 -> 2.90
Romain Naour (1):
wavemon: add recipe for version 0.9.5
Sascha Hauer (1):
signing.bbclass: fix wrong function name
Tim Orling (16):
python_mesonpy.bbclass: move to oe-core
python3-meson-python: move to oe-core
python3-pyproject-metadata: move to oe-core
meta-python: drop ${PYTHON_PN}
meta-oe: drop ${PYTHON_PN}
meta-filesystems: drop ${PYTHON_PN}
meta-networking: drop ${PYTHON_PN}
meta-gnome: drop ${PYTHON_PN}
python3-pytest-lazy-fixtures: add 1.0.5
python3-prettytable: upgrade 3.9.0 => 3.10.0; fix ptests
python3-pytest-lazy-fixture: drop recipe
meta-oe-image-ptest: add PTESTS_PROBLEMS_META_OE
meta-perl-image-ptest: add PTESTS_PROBLEMS_META_PERL
meta-python-image-ptest: add PTESTS_PROBLEMS_META_PYTHON
libencode-perl: drop recipe
libencode-locale-perl: drop recipe
Wang Mingyu (49):
babl: upgrade 0.1.106 -> 0.1.108
btop: upgrade 1.3.0 -> 1.3.2
gegl: upgrade 0.4.46 -> 0.4.48
gjs: upgrade 1.78.3 -> 1.78.4
gnome-bluetooth: upgrade 42.7 -> 42.8
gnome-keyring: upgrade 42.1 -> 46.1
isomd5sum: upgrade 1.2.3 -> 1.2.4
libei: upgrade 1.2.0 -> 1.2.1
libmanette: upgrade 0.2.6 -> 0.2.7
libmime-types-perl: upgrade 2.24 -> 2.26
logwatch: upgrade 7.9 -> 7.10
mpich: upgrade 4.1.2 -> 4.2.0
ostree: upgrade 2024.1 -> 2024.3
python3-aiohue: upgrade 4.7.0 -> 4.7.1
python3-awesomeversion: upgrade 23.11.0 -> 24.2.0
python3-bidict: upgrade 0.22.1 -> 0.23.0
python3-cantools: upgrade 39.4.3 -> 39.4.4
python3-cmake: upgrade 3.28.1 -> 3.28.3
python3-django: upgrade 5.0.1 -> 5.0.2
python3-dnspython: upgrade 2.5.0 -> 2.6.0
python3-elementpath: upgrade 4.2.0 -> 4.3.0
python3-engineio: upgrade 4.8.2 -> 4.9.0
python3-gevent: upgrade 23.9.1 -> 24.2.1
unbound: upgrade 1.19.0 -> 1.19.1
wireshark: upgrade 4.2.2 -> 4.2.3
protobuf: upgrade 4.25.2 -> 4.25.3
webkitgtk3: upgrade 2.42.4 -> 2.42.5
python3-tqdm: upgrade 4.66.1 -> 4.66.2
python3-google-api-python-client: upgrade 2.116.0 -> 2.118.0
python3-httpcore: upgrade 1.0.2 -> 1.0.3
python3-jsbeautifier: upgrade 1.14.11 -> 1.15.1
python3-langtable: upgrade 0.0.64 -> 0.0.65
python3-polyline: upgrade 2.0.1 -> 2.0.2
python3-protobuf: upgrade 4.25.2 -> 4.25.3
python3-pymisp: upgrade 2.4.184 -> 2.4.185
python3-pymodbus: upgrade 3.6.3 -> 3.6.4
python3-pytest-asyncio: upgrade 0.23.4 -> 0.23.5
python3-tox: upgrade 4.12.1 -> 4.13.0
python3-twine: upgrade 4.0.2 -> 5.0.0
python3-watchdog: upgrade 3.0.0 -> 4.0.0
python3-zopeinterface: upgrade 6.1 -> 6.2
remmina: upgrade 1.4.33 -> 1.4.34
sip: upgrade 6.8.2 -> 6.8.3
python3-google-auth: upgrade 2.27.0 -> 2.28.0
python3-gspread: upgrade 6.0.1 -> 6.0.2
python3-socketio: upgrade 5.11.0 -> 5.11.1
python3-sentry-sdk: upgrade 1.40.0 -> 1.40.4
python3-pydantic-core: upgrade 2.14.6 -> 2.16.1
python3-pydantic: upgrade 2.5.3 -> 2.6.0
William Lyu (1):
e2tools: Add ptest
Yi Zhao (1):
audit: upgrade 3.1.2 -> 4.0
Yoann Congal (2):
influxdb: Fix /etc files owner
influxdb: Add missing group to static id
chenheyun (1):
dropwatch: Use header files from sysroot instead of build host
poky: fc8e5d7c13..25d60ac6f6:
Adrian Freihofer (5):
devtool: ide-sdk python 3.12 escaping
sdk-manual: extensible.rst: cover devtool ide-sdk
devtool: ide-sdk launch.json per recipe only
devtool: ide-sdk prefer sources from workspace
oe-selftest devtool: ide-sdk tests
Alexander Kanavin (1):
dbus: disable assertions and enable only modular tests
Alexis Lothoré (7):
testimage: log exception when failing to retrieve artifacts
lib/oeqa: share get_json_result_dir helper
testimage: create a list of failed test post actions
oeqa/utils/postactions: isolate directory creation in dedicated action
oeqa/utils/postactions: add target disk usage stat as post action
oeqa/utils/postactions: testimage: add host disk usage stat as post action
oeqa/lib/utils/postactions: fix host disk usage stats retrieval
Bruce Ashfield (8):
linux-yocto/6.6: update to v6.6.17
linux-yocto/6.6: update CVE exclusions
linux-yocto/6.6: enable squashfs for selftests
linux-yocto/6.6: config: x86 tidy & consolidation
kern-tools: depend on git-replacement-native
linux-yocto/6.6: genericarm64 configuration/definition
linux-yocto/6.6: update to v6.6.18
linux-yocto/6.6: update CVE exclusions
Christoph Vogtländer (1):
overlayfs: add missing vardeps
Claus Stovgaard (1):
wpa-supplicant: Fix CVE-2023-52160
Eilís 'pidge' Ní Fhlannagáin (2):
creategroup*: Remove coreutils-native as a DEPENDS
selftest-users: Convoluted selftest for USERADD_DEPENDS
Emil Kronborg (1):
bluez5: remove configuration files from install task
Enguerrand de Ribaucourt (4):
devtool: ide: define compilerPath for meson projects
Revert "meson: use absolute cross-compiler paths"
bitbake: bitbake: progressbar: accept value over initial maxval
devtool: ide-sdk source mapping for vscode
Enrico Jörns (1):
wic: 'empty' plugin: fix typo in comment
Joe Slater (1):
qemuboot: predictable network interface names
Jonathan GUILLOT (2):
lib/oe/package: fix LOCALE_PATHS scan to create locale packages
glibc-locale: add an explicit dedicated package for locale.alias file
Jose Quaresma (1):
go: update 1.20.13 -> 1.20.14
Joshua Watt (1):
bitbake: asyncrpc: Add support for server headers
Khem Raj (6):
ncurses: Always pass -D_GNU_SOURCE
linux-yocto: Remove unused patch
ref-manual: variables: remove PYTHON_PN
python3-bcrypt: Fix build break on arches without 64 bit atomics
python3-maturin: Recognise riscv32 architecture
llvm: Update to 18.1.0 RC4
Lee Chee Yang (1):
migration-guide: add release notes for 4.3.3
Lei Maohui (1):
rpm: Fix the following error when run nativesdk-rpm in nativesdk environment.
Martin Jansa (1):
glib-2.0: backport a switch from distutils to packaging in codegen
Michael Halstead (1):
yocto-uninative: Update to 4.4 for glibc 2.39
Michael Opdenacker (5):
ref-manual: system-requirements: update packages to build docs
ref-manual: release-process: grammar fix
manuals: suppress excess use of "following" word
dev-manual: packages: clarify shared PR service constraint
dev-manual: packages: need enough free space
Munehisa Kamata (1):
kernel.bbclass: Set pkg-config variables for building modules
Nick Owens (1):
python3: dont disable readline module for editline
Philip Lorenz (1):
bitbake: fetch2: Ensure that git LFS objects are available
Piotr Łobacz (1):
useradd.bbclass: Fix order of postinst-useradd-*
Richard Purdie (6):
numactl: Upgrade 2.0.17 -> 2.0.18
lttng-ust: Upgrade 2.13.6 -> 2.13.7
oeqa/selftest/rust: Simplify the rust testsuite output gathering/processing
recipetool: Fix errors with meta-poky bbappend
bitbake: runqueue: Add support for BB_LOADFACTOR_MAX
mirrors: Switch llvm to use shallow cloning
Ross Burton (4):
base-files: add usage warning to motd
libexif: remove unused version_underscore
gstreamer1.0: skip a test that is known to be flaky
linux-firmware: split out more firmware pieces
Simone Weiß (6):
patchtest: provide further guidance for failed testcases
patchtest: Skip test for CVE_CHECK_IGNORE for older branches
meta: Remove some not needed CVE_STATUS
meta: Update CVE_STATUS for incorrect cpes
cve-check: Log if CVE_STATUS set but not reported for component
dev-manual: Rephrase spdx creation
Soumya Sambu (1):
bind: Upgrade 9.18.21 -> 9.18.24
Tim Orling (3):
bitbake: layerindexlib: fix missing layer branch backtrace
python3-cryptography{-vectors}: upgrade to 42.0.5
python3-attrs: disable Hypothesis deadline
Tobias Hagelborn (1):
bitbake: hashserv: Re-enable connection pooling with psycopg 3 driver
Trevor Gamblin (1):
python3-git: upgrade 3.1.41 -> 3.1.42
Trevor Woerner (1):
wic: allow imager-specific filename extensions
Ulrich Ölmann (1):
bitbake: taskexp_ncurses: fix execution example in introductory comment
Wang Mingyu (44):
bash-completion: upgrade 2.11 -> 2.12.0
ccache: upgrade 4.9 -> 4.9.1
createrepo-c: upgrade 1.0.3 -> 1.0.4
ed: upgrade 1.20 -> 1.20.1
efivar: upgrade 38 -> 39
gcr: upgrade 4.1.0 -> 4.2.0
git: upgrade 2.43.0 -> 2.44.0
libffi: upgrade 3.4.5 -> 3.4.6
libgpg-error: upgrade 1.47 -> 1.48
libhandy: upgrade 1.8.2 -> 1.8.3
libksba: upgrade 1.6.5 -> 1.6.6
libmicrohttpd: upgrade 0.9.77 -> 1.0.1
libpng: upgrade 1.6.41 -> 1.6.42
libsecret: upgrade 0.21.2 -> 0.21.4
libunistring: upgrade 1.1 -> 1.2
liburi-perl: upgrade 5.25 -> 5.27
libxext: upgrade 1.3.5 -> 1.3.6
libxkbfile: upgrade 1.1.2 -> 1.1.3
libxvmc: upgrade 1.0.13 -> 1.0.14
lighttpd: upgrade 1.4.73 -> 1.4.74
makedepend: upgrade 1.0.8 -> 1.0.9
mpg123: upgrade 1.32.4 -> 1.32.5
ofono: upgrade 2.3 -> 2.4
pango: upgrade 1.51.0 -> 1.52.0
pciutils: upgrade 3.10.0 -> 3.11.1
pkgconf: upgrade 2.1.0 -> 2.1.1
python3-beartype: upgrade 0.17.0 -> 0.17.2
python3-certifi: upgrade 2023.11.17 -> 2024.2.2
python3-dbusmock: upgrade 0.30.2 -> 0.31.1
python3-hypothesis: upgrade 6.97.3 -> 6.98.12
python3-pip: upgrade 23.3.2 -> 24.0
python3-pycairo: upgrade 1.25.1 -> 1.26.0
python3-pytest: upgrade 8.0.0 -> 8.0.2
python3-pytz: upgrade 2023.4 -> 2024.1
python3-setuptools-rust: upgrade 1.8.1 -> 1.9.0
python3-trove-classifiers: upgrade 2024.1.8 -> 2024.2.23
python3-typing-extensions: upgrade 4.9.0 -> 4.10.0
python3: upgrade 3.12.1 -> 3.12.2
python3-urllib3: upgrade 2.1.0 -> 2.2.1
python3-yamllint: upgrade 1.33.0 -> 1.35.1
swig: upgrade 4.2.0 -> 4.2.1
xkbcomp: upgrade 1.4.6 -> 1.4.7
xkeyboard-config: upgrade 2.40 -> 2.41
xprop: upgrade 1.2.6 -> 1.2.7
Xiangyu Chen (2):
systemd-systemctl: fix dead loop when multi services enable each other
libc-locale: fix ASCII compatible warning cause build failure.
Xiaotian Wu (2):
loongarch64: change -march to loongarch64
openssl: Match target name for loongarch64
Yash Shinde (3):
rust: Upgrade 1.74.1 -> 1.75.0
rust: Revert PGO to it's default
rust: reproducibility issue fix with v1.75
Yoann Congal (1):
waf: Improve version parsing to avoid failing on warnings
Change-Id: I6dfb848feb4ec8f5aae56a9ccbff475f4eb1edc6
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'meta-openembedded')
382 files changed, 2601 insertions, 1643 deletions
diff --git a/meta-openembedded/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc b/meta-openembedded/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc new file mode 100644 index 0000000000..f57bbab930 --- /dev/null +++ b/meta-openembedded/meta-filesystems/conf/include/ptest-packagelists-meta-filesystems.inc @@ -0,0 +1,18 @@ +# +# Lists of the ptest in meta-filesystems, sorted into two sets by the time they take +# Please keep these sorted in alphabetical order +# +# A first pass at getting all meta-filesystems recipes which inherit ptest +# meta_filesystems_ptest_recipes=$(bitbake-layers show-recipes --recipes-only --layer meta-filesystems --inherits ptest --bare | sed -e '1,/=== Matching recipes: ===/d') +# ptests which take less than ~30s each + +PTESTS_FAST_META_FILESYSTEMS = "\ + e2tools \ + fuse3 \ +" + +PTESTS_SLOW_META_FILESYSTEMS = "\ +" +PTESTS_PROBLEMS_META_FILESYSTEMS = "\ + sshfs-fuse \ +" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-all.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-all.bb new file mode 100644 index 0000000000..ffbfa1a3f6 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-filesystems ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-filesystems.inc + +# Include the full set of ptests +PTESTS_META_FILESYSTEMS = "${PTESTS_FAST_META_FILESYSTEMS} ${PTESTS_SLOW_META_FILESYSTEMS} ${PTESTS_PROBLEMS_META_FILESYSTEMS}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-filesystems-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_FILESYSTEMS').split()])}" + +do_build[depends] = "${@' '.join(['meta-filesystems-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_FILESYSTEMS').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-fast.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-fast.bb new file mode 100644 index 0000000000..dfb0837aa6 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest-fast.bb @@ -0,0 +1,5 @@ +require meta-filesystems-image-ptest-all.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-filesystems ptest images." + +PTESTS_META_FILESYSTEMS = "${PTESTS_FAST_META_FILESYSTEMS}" diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest.bb new file mode 100644 index 0000000000..90d6a92c1b --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/images/meta-filesystems-image-ptest.bb @@ -0,0 +1,40 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require recipes-core/images/core-image-minimal.bb +require conf/include/ptest-packagelists-meta-filesystems.inc + +SUMMARY = "meta-filesystems ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_FILESYSTEMS = "${PTESTS_SLOW_META_FILESYSTEMS} ${PTESTS_FAST_META_FILESYSTEMS} ${PTESTS_PROBLEMS_META_FILESYSTEMS}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_FILESYSTEMS').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-<pn> = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memroy, it can be customized: +#QB_MEM:virtclass-mcextend-<pn> = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch new file mode 100644 index 0000000000..63cdc57b44 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch @@ -0,0 +1,34 @@ +From 03ee1f8aa0899268ec02b2f54849352df92a3a1d Mon Sep 17 00:00:00 2001 +From: Gabriel Staples <ercaguy@gmail.com> +Date: Tue, 22 Dec 2020 23:33:55 -0800 +Subject: [PATCH] pytest.ini: fix test warning + +Warning: + +``` +test/util.py:99 + sshfs/build/test/util.py:99: PytestUnknownMarkWarning: Unknown pytest.mark.uses_fuse - is this a typo? + You can register custom marks to avoid this warning - for details, see https://docs.pytest.org/en/stable/mark.html + return pytest.mark.uses_fuse() +``` + +References for the fix: + +1. https://stackoverflow.com/questions/60806473/pytestunknownmarkwarning-unknown-pytest-mark-xxx-is-this-a-typo/60813297#60813297 +1. https://docs.pytest.org/en/stable/mark.html + +Upstream-Status: Submitted [https://github.com/libfuse/sshfs/pull/238] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/pytest.ini | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/pytest.ini b/test/pytest.ini +index 95161546..7a7efed4 100644 +--- a/test/pytest.ini ++++ b/test/pytest.ini +@@ -1,2 +1,4 @@ + [pytest] + addopts = --verbose --assert=rewrite --tb=native -x -r a ++markers = ++ uses_fuse diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch new file mode 100644 index 0000000000..e76dbd5059 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse/a1d58ae1be99571a88b8439b027abe6349b74658.patch @@ -0,0 +1,31 @@ +From a1d58ae1be99571a88b8439b027abe6349b74658 Mon Sep 17 00:00:00 2001 +From: Gabriel Staples <ercaguy@gmail.com> +Date: Tue, 22 Dec 2020 23:26:40 -0800 +Subject: [PATCH] Fix deprecated warning in conftest.py + +``` +test/conftest.py:66 + sshfs/build/test/conftest.py:66: PytestDeprecationWarning: @pytest.yield_fixture is deprecated. + Use @pytest.fixture instead; they are the same. + @pytest.yield_fixture(autouse=True) +``` + +Upstream-Status: Submitted [https://github.com/libfuse/sshfs/pull/238] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/conftest.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/conftest.py b/test/conftest.py +index 70cd0c62..d58d45b2 100644 +--- a/test/conftest.py ++++ b/test/conftest.py +@@ -63,7 +63,7 @@ def register_output(self, pattern, count=1, flags=re.MULTILINE): + # relies on tests running sequential (i.e., don't dare to use e.g. the xdist + # plugin) + current_capfd = None +-@pytest.yield_fixture(autouse=True) ++@pytest.fixture(autouse=True) + def save_cap_fixtures(request, capfd): + global current_capfd + capfd.false_positives = [] diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb index 1d07061ff0..5a926dac0c 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_3.7.3.bb @@ -5,7 +5,10 @@ LICENSE = "GPL-2.0-only" DEPENDS = "glib-2.0 fuse3" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https" +SRC_URI = "git://github.com/libfuse/sshfs;branch=master;protocol=https \ + file://03ee1f8aa0899268ec02b2f54849352df92a3a1d.patch \ + file://a1d58ae1be99571a88b8439b027abe6349b74658.patch \ +" SRCREV = "c91eb9a9a992f1a36c49a8e6f1146e45b5e1c8e7" S = "${WORKDIR}/git" @@ -16,8 +19,9 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ bash \ + fuse \ " do_install_ptest() { diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb index 66c35010b8..321851da5c 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse3_3.16.2.bb @@ -29,8 +29,10 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - bash \ + python3-pytest \ + python3-looseversion \ + kernel-module-cuse \ + bash \ " do_install_ptest() { diff --git a/meta-openembedded/meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb b/meta-openembedded/meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb new file mode 100644 index 0000000000..323ddb4157 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-support/python3-looseversion/python3-looseversion_1.3.0.bb @@ -0,0 +1,14 @@ +# Copyright (C) 2024 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Version numbering for anarchists and software realists" +HOMEPAGE = "https://github.com/effigies/looseversion" +LICENSE = "PSF-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d5605fc335ce1bab614032468d0a1e00" + +DEPENDS = "python3-hatchling-native" +SRC_URI[sha256sum] = "ebde65f3f6bb9531a81016c6fef3eb95a61181adc47b7f949e9c0ea47911669e" + +inherit pypi python_hatchling + +PYPI_PACKAGE = "looseversion" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb index caf0025c8e..a80b6f5985 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb @@ -9,17 +9,64 @@ SECTION = "base" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS += "e2fsprogs" +DEPENDS += "coreutils e2fsprogs" PV = "0.1.0+git" SRC_URI = " \ git://github.com/e2tools/e2tools;protocol=https;branch=master \ + file://run-ptest \ " + SRCREV = "fd092754a6b65c3a769f74f888668c066f09c36d" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest + +do_configure:prepend() { + git -C "${WORKDIR}/git" reset --hard HEAD + + # To install ptest for this package, special configuration needs to be + # done before do_configure(). So, do_configure_ptest() which is scheduled + # after do_configure() cannot be used. + + # We only do special configuration if we are installing ptest for this + # package. + if [ "${@d.getVar('PTEST_ENABLED')}" -eq "1" ]; then + # Since we guarantee run-time dependency when installing the ptest for + # this package, we do not need the check macros under section "checks + # for programs" in "configure.ac". Plus, these check macros set the + # ouput variables to incorrect values as these checks are performed on + # the host environment. Still, we need these variables outputted from + # these check macros. So, we insert the following lines to manually + # set these output variables to the correct value in "configure.ac". + + # Note that HAVE_DD_COMMAND and HAVE_MKE2FS_COMMAND are only ever used + # in tests/Makefile-files which determines whether to include the test + # cases. As for output variables CHMOD, DD, and MKE2FS, they only + # point to the programs which test cases need to run. Since these + # commands are guaranteed to be present due to RDEPENDS and are + # guaranteed to be accessible under PATH environment variable on the + # target, we only need to specify the name of these programs. + + perl -i -0777 -pe 's/(^dnl\s*=+\s*^dnl\s*Checks for compiler flags\s*^dnl\s*=+)/ +AC_SUBST([CHMOD], 'chmod') +AC_SUBST([DD], 'dd') +AC_SUBST([MKE2FS], 'mke2fs') +AM_CONDITIONAL([HAVE_DD_COMMAND], [true]) +AM_CONDITIONAL([HAVE_MKE2FS_COMMAND], [true]) +\1/ms' "${WORKDIR}/git/configure.ac" + fi +} + +do_install_ptest() { + rm -rf "${D}${PTEST_PATH}/*" + cp -r ../build "${D}${PTEST_PATH}" + cp -r "${S}/build-aux" "${D}${PTEST_PATH}/build" + cp -r "${S}" "${D}${PTEST_PATH}" +} + +RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/e2tools/files/run-ptest b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/files/run-ptest new file mode 100644 index 0000000000..3d4dd9cf37 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/files/run-ptest @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +make -C build check diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.106.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb index 61cd7ada9a..e0685f781d 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.106.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb @@ -10,7 +10,7 @@ inherit setuptools3 gnomebase gobject-introspection vala DEPENDS += "lcms" SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[sha256sum] = "d325135d3304f088c134cc620013acf035de2e5d125a50a2d91054e7377c415f" +SRC_URI[sha256sum] = "26defe9deaab7ac4d0e076cab49c2a0d6ebd0df0c31fd209925a5f07edee1475" FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.46.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb index 8c3f89fa9b..34e001a5f7 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.46.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb @@ -26,7 +26,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "d0b3b2481bc8774c5f3d0a487611910166d18eef823a859fb91e781ab7b1e892" +SRC_URI[sha256sum] = "418c26d94be8805d7d98f6de0c6825ca26bd74fcacb6c188da47533d9ee28247" PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2" PACKAGECONFIG:class-native = "libpng librsvg" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch new file mode 100644 index 0000000000..40fd93b984 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch @@ -0,0 +1,32 @@ +Signed-off-by: Markus Volk <f_l_k@t-online.de> +Upstream-Status: Inappropriate [https://gitlab.gnome.org/GNOME/gedit/-/issues/588] + +Temporary workaround to fix build: +../plugins/quickhighlight/gedit-quick-highlight-plugin.c: In function ‘gedit_quick_highlight_plugin_load_style’: +../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:47: error: implicit declaration of function ‘gtk_source_style_copy’; did you mean ‘gtk_source_style_apply’? [-Wimplicit-function-declaration] + + 96 | plugin->priv->style = gtk_source_style_copy (style); + | ^~~~~~~~~~~~~~~~~~~~~ + | gtk_source_style_apply +../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:47: warning: nested extern declaration of ‘gtk_source_style_copy’ [-Wnested-externs] +../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:45: error: assignment to ‘GtkSourceStyle *’ {aka ‘struct _GtkSourceStyle *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion] + 96 | plugin->priv->style = gtk_source_style_copy (style); + | ^ + +--- a/plugins/quickhighlight/gedit-quick-highlight-plugin.c 2024-02-20 08:11:47.925749255 +0100 ++++ b/plugins/quickhighlight/gedit-quick-highlight-plugin.c 2024-02-20 08:12:16.218594067 +0100 +@@ -90,11 +90,12 @@ + if (style_scheme != NULL) + { + style = gtk_source_style_scheme_get_style (style_scheme, "quick-highlight-match"); +- ++#if 0 + if (style != NULL) + { + plugin->priv->style = gtk_source_style_copy (style); + } ++#endif + } + } + + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb index c0221b9a72..6cdc33c1cc 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb @@ -23,7 +23,8 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc get def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "a1a6e37f041765dff7227a1f5578b6f49faaf016b1e17e869caf5bfb94c6aa4e" +SRC_URI += "file://0001-fix-for-clang-18.patch" +SRC_URI[archive.sha256sum] = "c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.1.0.bb index 00e5bec329..0ebc22acbd 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.1.0.bb @@ -7,9 +7,9 @@ DEPENDS = "glib-2.0 gtk+3 libxml2" inherit meson pkgconfig gobject-introspection features_check gtk-doc -SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=libgedit-gtksourceview-299-0" +SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "7e2179a8ff3022edad27e2d57744876d125cb040" +SRCREV = "b271a625ca057cc3fa7d5ac83285c5d4e038202e" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.78.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.78.4.bb index 59d0a7b874..c1d1948d6a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.78.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.78.4.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] = "42d50364caa5d792c76734fe5bbcc4b9dbb48819da20a4060061e8b9526134a4" +SRC_URI[archive.sha256sum] = "9aec7ab872c2050404907ae94f0ae7abec8a54bd9c894ddb5c2d0f51e932b9a1" 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/gnome-bluetooth/gnome-bluetooth_42.7.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.8.bb index ba5e558264..6d4d84e1e8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.7.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.8.bb @@ -25,7 +25,7 @@ inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "94df1729dbec3bb105e588eaf5312bbbaa05c49ea733202a10dc3f7532bdf869" +SRC_URI[archive.sha256sum] = "76c241e8ca2c9b1035364535ca26084f89fc5c0e1829510f8909583115fcc2db" BT_PULSE_PACKS = " \ pulseaudio-lib-bluez5-util \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.3.bb index d146bc4bd7..cb9a57798b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.3.bb @@ -38,7 +38,7 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRC_URI[archive.sha256sum] = "0cfa3c332d6edacb73d06c6b26ffca1078e86ff59eac819b2931e0967753df70" +SRC_URI[archive.sha256sum] = "b1e949c4e86c0624ec6a6ed0df09c9fae2b22983c1dca60ed86aec8ef0b24004" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[cups] = ",,cups,cups" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch index 32eecf8fb7..c3c3050924 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch @@ -1,4 +1,4 @@ -From e6464e01bc1cdf5496be2942d1bac41aa609f47e Mon Sep 17 00:00:00 2001 +From 647f3d946ec3fe4800b2bec89371f85a1a4b15cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Thu, 23 May 2019 23:44:06 +0200 Subject: [PATCH] Set paths to ssh-agent and ssh-add by configure options @@ -11,15 +11,16 @@ We have no executables in our sysroot so configuration won't find them. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 4b83664..eda0c96 100644 +index f4f793c..5194e5d 100644 --- a/configure.ac +++ b/configure.ac -@@ -351,8 +351,15 @@ if test "$enable_ssh_agent" = "no"; then +@@ -356,8 +356,15 @@ if test "$enable_ssh_agent" = "no"; then SSH_AGENT=false SSH_ADD=false else @@ -37,6 +38,3 @@ index 4b83664..eda0c96 100644 if test "$SSH_AGENT" = "no" -o "$SSH_ADD" = "no"; then AC_MSG_ERROR([the ssh-agent and ssh-add commands were not found]) else --- -2.20.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb index 65c22e6392..8df3710e6a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb @@ -22,7 +22,7 @@ inherit gnomebase gsettings features_check gettext ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "c7f4d040cc76a6b7fe67e08ef9106911c3c80d40fc88cbfc8e2684a4c946e3e6" +SRC_URI[archive.sha256sum] = "b1d3ae9132ff2f8b3f25a190790892968e3d0acf952a487e40f644a8550ce3f6" SRC_URI += " \ file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ file://musl.patch \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.4.bb index 1dd043ec82..9512f0b584 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_45.4.bb @@ -32,7 +32,7 @@ GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -SRC_URI[archive.sha256sum] = "3a19724720d8274dc6bced68e0dd5fc7668a04cd79978cbbb8223474ccdda9ab" +SRC_URI[archive.sha256sum] = "5bfea379e120b1c7f237f3ec369ad27ef5c2f5930c7df163b392782d8582090d" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -50,7 +50,7 @@ EXTRA_OEMESON = " \ do_install:append() { # fix shebangs for tool in `find ${D}${bindir} -name '*-tool'`; do - sed -i 's:#!${PYTHON}:#!${bindir}/${PYTHON_PN}:' $tool + sed -i 's:#!${PYTHON}:#!${bindir}/python3:' $tool done } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_45.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_45.4.bb index 85bfdd5289..eccc635456 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_45.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_45.4.bb @@ -24,7 +24,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.sha256sum] = "b78aea7f3e2bec8322a2af0404716be2269905c7d50c04b0b2a71a38814fcd01" +SRC_URI[archive.sha256sum] = "91140837be15582f2c753be661ab8e42dad55d4a1b0f0650bd0b2c93f02bd7ab" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" diff --git a/meta-openembedded/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc b/meta-openembedded/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc new file mode 100644 index 0000000000..e21ad5766b --- /dev/null +++ b/meta-openembedded/meta-multimedia/conf/include/ptest-packagelists-meta-multimedia.inc @@ -0,0 +1,17 @@ +# +# Lists of the ptest in meta-multimedia, sorted into two sets by the time they take +# Please keep these sorted in alphabetical order +# +# A first pass at getting all meta-multimedia recipes which inherit ptest +# meta_multimedia_ptest_recipes=$(bitbake-layers show-recipes --recipes-only --layer meta-multimedia --inherits ptest --bare | sed -e '1,/=== Matching recipes: ===/d') +# ptests which take less than ~30s each + +PTESTS_FAST_META_MULTIMEDIA = "\ +" + +PTESTS_SLOW_META_MULTIMEDIA = "\ +" + +PTESTS_PROBLEMS_META_MULTIMEDIA = "\ + libopenmpt \ +" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.0.bb index 2d5049b9ae..e503af44ce 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.0.bb @@ -7,11 +7,11 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669" SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;branch=master" -SRCREV = "48035599cdd4e4415732e408c407e0c1cd1c7444" +SRCREV = "bb645893f374ab694b10a79f1205a728e010f2c9" S = "${WORKDIR}/git" DEPENDS:append:x86 = " nasm-native" DEPENDS:append:x86-64 = " nasm-native" -inherit meson +inherit meson pkgconfig diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest-all.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest-all.bb new file mode 100644 index 0000000000..8accba1bff --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-multimedia ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-multimedia.inc + +# Include the full set of ptests +PTESTS_META_MULTIMEDIA = "${PTESTS_FAST_META_MULTIMEDIA} ${PTESTS_SLOW_META_MULTIMEDIA} ${PTESTS_PROBLEMS_META_MULTIMEDIA}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-multimedia-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_MULTIMEDIA').split()])}" + +do_build[depends] = "${@' '.join(['meta-multimedia-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_MULTIMEDIA').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest-fast.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest-fast.bb new file mode 100644 index 0000000000..6abd1a9ea3 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest-fast.bb @@ -0,0 +1,5 @@ +require meta-multimedia-image-ptest-all.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-multimedia ptest images." + +PTESTS_META_MULTIMEDIA = "${PTESTS_FAST_META_MULTIMEDIA}" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest.bb new file mode 100644 index 0000000000..887396d4cc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/images/meta-multimedia-image-ptest.bb @@ -0,0 +1,40 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require recipes-core/images/core-image-minimal.bb +require conf/include/ptest-packagelists-meta-multimedia.inc + +SUMMARY = "meta-multimedia ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_MULTIMEDIA = "${PTESTS_SLOW_META_MULTIMEDIA} ${PTESTS_FAST_META_MULTIMEDIA} ${PTESTS_PROBLEMS_META_MULTIMEDIA}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_MULTIMEDIA').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-<pn> = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memroy, it can be customized: +#QB_MEM:virtclass-mcextend-<pn> = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch new file mode 100644 index 0000000000..a6526d5903 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch @@ -0,0 +1,34 @@ +From 7982e55ce3a8b3c60a47258ff7d37d0dd78c303d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Feb 2024 18:44:23 -0800 +Subject: [PATCH] rpi: Use alloca instead of variable length arrays + +Clang-18+ diagnoses this as error + +| ../git/src/ipa/rpi/controller/rpi/alsc.cpp:499:10: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] | 499 | int xLo[X], xHi[X]; +| | ^ + +Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040529.html] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/ipa/rpi/controller/rpi/alsc.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ipa/rpi/controller/rpi/alsc.cpp b/src/ipa/rpi/controller/rpi/alsc.cpp +index 8a205c60..8c0ae8eb 100644 +--- a/src/ipa/rpi/controller/rpi/alsc.cpp ++++ b/src/ipa/rpi/controller/rpi/alsc.cpp +@@ -496,8 +496,8 @@ void resampleCalTable(const Array2D<double> &calTableIn, + * Precalculate and cache the x sampling locations and phases to save + * recomputing them on every row. + */ +- int xLo[X], xHi[X]; +- double xf[X]; ++ int *xLo = (int*)alloca(X), *xHi = (int*)alloca(X); ++ double *xf = (double*)alloca(X); + double scaleX = cameraMode.sensorWidth / + (cameraMode.width * cameraMode.scaleX); + double xOff = cameraMode.cropX / (double)cameraMode.sensorWidth; +-- +2.43.2 + diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.2.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.2.0.bb index 5b2e863369..b96e69eeb4 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.2.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.2.0.bb @@ -12,6 +12,7 @@ SRC_URI = " \ git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ file://0001-media_device-Add-bool-return-type-to-unlock.patch \ file://0002-options-Replace-use-of-VLAs-in-C.patch \ + file://0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch \ " SRCREV = "89227a428a82e724548399d35c98ea89566f9045" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.3.bb index 92f33da899..8bb49b2f12 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libopenmpt/libopenmpt_0.7.3.bb @@ -74,6 +74,7 @@ FILES:${PN}-openmpt123-doc = "${mandir}/man1/openmpt123*" DEBIAN_NOAUTONAME:${PN} = "1" RDEPENDS:${PN}:libc-glibc = " \ + glibc-gconv \ glibc-gconv-cp1252 \ glibc-gconv-ibm437 \ glibc-gconv-iso8859-1 \ diff --git a/meta-openembedded/meta-networking/classes/waf-samba.bbclass b/meta-openembedded/meta-networking/classes/waf-samba.bbclass index 41909788f7..c8bf7bacf8 100644 --- a/meta-openembedded/meta-networking/classes/waf-samba.bbclass +++ b/meta-openembedded/meta-networking/classes/waf-samba.bbclass @@ -95,6 +95,7 @@ do_configure() { export STAGING_LIBDIR=${STAGING_LIBDIR} export STAGING_INCDIR=${STAGING_INCDIR} export PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} + export PYTHONARCHDIR=${PYTHON_SITEPACKAGES_DIR} export PYTHON_CONFIG=${STAGING_EXECPREFIXDIR}/python-target-config/python3-config CONFIG_CMD="./configure ${CONFIGUREOPTS} ${EXTRA_OECONF} --cross-compile" diff --git a/meta-openembedded/meta-networking/conf/include/ptest-packagelists-meta-networking.inc b/meta-openembedded/meta-networking/conf/include/ptest-packagelists-meta-networking.inc new file mode 100644 index 0000000000..574e3a0aa1 --- /dev/null +++ b/meta-openembedded/meta-networking/conf/include/ptest-packagelists-meta-networking.inc @@ -0,0 +1,37 @@ +# +# Lists of the ptest in meta-networking, sorted into two sets by the time they take +# Please keep these sorted in alphabetical order +# +# A first pass at getting all meta-networking recipes which inherit ptest +# meta_networking_ptest_recipes=$(bitbake-layers show-recipes --recipes-only --layer meta-networking --inherits ptest --bare | sed -e '1,/=== Matching recipes: ===/d') +# ptests which take less than ~30s each + +PTESTS_FAST_META_NETWORKING = "\ + geoip \ + libcoap \ + libldb \ + libnftnl \ + libtalloc \ + libtdb \ + lldpd \ + mbedtls \ + openhpi \ + squid \ + tcpdump \ +" + +# firewalld currently hangs forever so disable it for now +# firewalld +PTESTS_SLOW_META_NETWORKING = "\ + net-snmp \ +" + +PTESTS_PROBLEMS_META_NETWORKING = "\ + freediameter \ + geoip-perl \ + libtevent \ + lksctp-tools \ + nftables \ + openl2tp \ + python3-scapy \ +" diff --git a/meta-openembedded/meta-networking/conf/layer.conf b/meta-openembedded/meta-networking/conf/layer.conf index 2343179a62..a9088eece4 100644 --- a/meta-openembedded/meta-networking/conf/layer.conf +++ b/meta-openembedded/meta-networking/conf/layer.conf @@ -13,8 +13,7 @@ BBFILE_PRIORITY_networking-layer = "5" # cause compatibility issues with other layers LAYERVERSION_networking-layer = "1" -LAYERDEPENDS_networking-layer = "core" -LAYERDEPENDS_networking-layer += "openembedded-layer" +LAYERDEPENDS_networking-layer = "core meta-python openembedded-layer" LAYERSERIES_COMPAT_networking-layer = "nanbield" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch b/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch new file mode 100644 index 0000000000..7147c042a1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq/0001-example-Use-lm-for-the-fst-module.patch @@ -0,0 +1,32 @@ +From 9357da2a5a829f7a0620e6c19835a65b7b02a8fb Mon Sep 17 00:00:00 2001 +From: Khawaja Shaheryar <behzadshaheryar@gmail.com> +Date: Tue, 20 Feb 2024 21:03:26 +0500 +Subject: [PATCH] example: Use -lm for the fst module + +If -lm is not passed in Makefile.am, the following is seen +| arm-yoe-linux-gnueabi-ld.lld: error: undefined symbol: ceilf +| >>> referenced by math.h:632 (/usr/include/c++/v1/math.h:632) +| >>> libdaq_static_fst_la-daq_fst.o:(std::__1::pair<std::__1::__hash_iterator<std::__1::__hash_node<std::__1::__hash_value_type<FstKey, FstNode*>, void*>*>, bool> std::__1::__hash_table<std::__1::__hash_value_type<FstKey, FstNode*>, std::__1::__unordered_map_hasher<FstKey, std::__1::__hash_value_type<FstKey, FstNode*>, FstKeyHash, std::__1::equal_to<FstKey>, true>, std::__1::__unordered_map_equal<FstKey, std::__1::__hash_value_type<FstKey, FstNode*>, std::__1::equal_to<FstKey>, FstKeyHash, true>, std::__1::allocator<std::__1::__hash_value_type<FstKey, FstNode*>>>::__emplace_unique_key_args<FstKey, std::__1::pair<FstKey const, FstNode*>>(FstKey const&, std::__1::pair<FstKey const, FstNode*>&&)) in archive ../modules/fst/.libs/libdaq_static_fst.a + +Upstream-Status: Pending + +Signed-off-by: Khawaja Shaheryar <behzadshaheryar@gmail.com> +--- + example/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/example/Makefile.am b/example/Makefile.am +index 0d5ca31..1eaa9e8 100644 +--- a/example/Makefile.am ++++ b/example/Makefile.am +@@ -31,6 +31,7 @@ endif + if BUILD_FST_MODULE + daqtest_static_CFLAGS += -DBUILD_FST_MODULE + daqtest_static_LDADD += ${top_builddir}/modules/fst/libdaq_static_fst.la $(DAQ_FST_LIBS) ++daqtest_static_LDFLAGS += -lm + endif + if BUILD_NETMAP_MODULE + daqtest_static_CFLAGS += -DBUILD_NETMAP_MODULE +-- +2.34.1 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_git.bb new file mode 100644 index 0000000000..19346124bf --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "LibDAQ: The Data AcQuisition Library" +DESCRIPTION = "LibDAQ is a pluggable abstraction layer for interacting with a data source (traditionally a network interface or network data plane)." +HOMEPAGE = "http://www.snort.org" +SECTION = "libs" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=79258250506422d064560a7b95b2d53e" + +DEPENDS = "libdnet libpcap" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \ + file://0001-example-Use-lm-for-the-fst-module.patch" +SRCREV = "c757aaae5a70d5bbb3239c5a16bca217a5aca651" + +S = "${WORKDIR}/git" + +FILES:${PN} += "${libdir}/daq/*.so" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb index a15c69b601..48f50abaf1 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-fortisslvpn_1.4.0.bb @@ -4,10 +4,10 @@ SECTION = "net/misc" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "glib-2.0-native libxml2-native networkmanager ppp" +DEPENDS = "glib-2.0-native libxml2-native networkmanager ppp python3-packaging-native" GNOMEBASEBUILDCLASS = "autotools" -inherit gnomebase gettext useradd +inherit gnomebase gettext useradd python3native SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager-fortisslvpn/${@gnome_verdir("${PV}")}/NetworkManager-fortisslvpn-${PV}.tar.xz \ diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch new file mode 100644 index 0000000000..7b7a0d098f --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Check-for-HP-libunwind.patch @@ -0,0 +1,33 @@ +From 433a412fad2ab0383ac3c625d183a71684f2b97b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Feb 2024 15:35:14 -0800 +Subject: [PATCH] cmake: Check for HP libunwind + +This is to ensure that cmake does not detect LLVM unwinder, which +can provide the support for some HP unwinder functionality but not all +e.g. unw_strerror goes missing. By checking for libunwind-common.h in +tests we ensure that this test passes only with HP libunwind. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/FindLibunwind.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake +index f66800a18..1ad66fc83 100644 +--- a/cmake/FindLibunwind.cmake ++++ b/cmake/FindLibunwind.cmake +@@ -22,7 +22,7 @@ find_package(PkgConfig QUIET) + pkg_check_modules(PC_LIBUNWIND libunwind) + + find_path(LIBUNWIND_INCLUDE_DIRS +- NAMES libunwind.h ++ NAMES libunwind-common.h + HINTS ${PC_LIBUNWIND_INCLUDE_DIRS} + ) + +-- +2.43.2 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch new file mode 100644 index 0000000000..ec7b90cfb4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch @@ -0,0 +1,31 @@ +From 417ed0045b3d04f539a8eb18b07a208c75f6c7e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 20 Feb 2024 16:08:20 -0800 +Subject: [PATCH] cmake: Pass --noline flag to flex + +This ensures that line directive is not emitted into lexer output which +could be absolute build paths, since these files end up in dbg packages +this can be flagged as a build/packaging warning. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/configure_options.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake +index f3673f399..fbd0bd2c3 100644 +--- a/cmake/configure_options.cmake ++++ b/cmake/configure_options.cmake +@@ -28,7 +28,7 @@ if ( ENABLE_LARGE_PCAP ) + endif ( ENABLE_LARGE_PCAP ) + + # Flex Lexer +-set ( FLEX_FLAGS "-Ca" ) ++set ( FLEX_FLAGS "-Ca --noline" ) + + # documentation + +-- +2.43.2 + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_git.bb new file mode 100644 index 0000000000..b8826b0682 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_git.bb @@ -0,0 +1,40 @@ +SUMMARY = "snort3" +DESCRIPTION = "snort3 - a free lightweight network intrusion detection system for UNIX and Windows." +HOMEPAGE = "http://www.snort.org/" +SECTION = "net" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" + +PV = "3+git" + +DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind luajit zlib" + +SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ + file://0001-cmake-Check-for-HP-libunwind.patch \ + file://0001-cmake-Pass-noline-flag-to-flex.patch" +SRCREV = "e1760a8dbb829bb3fcf1a340ab6cc4bb80a47ecd" + +S = "${WORKDIR}/git" + +PACKAGES =+ "${PN}-scripts" + +inherit cmake pkgconfig + +do_install:append() { + sed -i "s#${RECIPE_SYSROOT_NATIVE}##g; s#${RECIPE_SYSROOT}##g" ${D}${libdir}/pkgconfig/snort.pc +} + +FILES:${PN} += "${libdir}/snort/daq/*.so" + +FILES:${PN}-scripts = "${bindir}/appid_detector_builder.sh" + +RDEPENDS:${PN}-scripts += "bash" + +# mips64/ppc/ppc64/riscv64/riscv32 is not supported in this release +COMPATIBLE_HOST:mipsarchn32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" +COMPATIBLE_HOST:powerpc = "null" +COMPATIBLE_HOST:powerpc64 = "null" +COMPATIBLE_HOST:powerpc64le = "null" +COMPATIBLE_HOST:riscv64 = "null" +COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb new file mode 100644 index 0000000000..6d96d4a876 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest-all.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Recipe to trigger execution of all meta-networking ptest images." +HOMEPAGE = "https://www.openembedded.org/" + +LICENSE = "MIT" + +inherit features_check nopackages +REQUIRED_DISTRO_FEATURES = "ptest" + +require conf/include/ptest-packagelists-meta-networking.inc + +# Include the full set of ptests +PTESTS_META_NETWORKING = "${PTESTS_FAST_META_NETWORKING} ${PTESTS_SLOW_META_NETWORKING} ${PTESTS_PROBLEMS_META_NETWORKING}" + +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['meta-networking-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_NETWORKING').split()])}" + +do_build[depends] = "${@' '.join(['meta-networking-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS_META_NETWORKING').split()])}" + +# normally image.bbclass would do this +EXCLUDE_FROM_WORLD = "1" + +python () { + if bb.utils.contains('IMAGE_CLASSES', 'testimage', True, False, d): + bb.build.addtask("do_testimage", "", "", d) +} diff --git a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest-fast.bb b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest-fast.bb new file mode 100644 index 0000000000..9f46ac8c1d --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest-fast.bb @@ -0,0 +1,5 @@ +require meta-networking-image-ptest-all.bb + +DESCRIPTION = "Recipe to trigger execution of all fast meta-networking ptest images." + +PTESTS_META_NETWORKING = "${PTESTS_FAST_META_NETWORKING}" diff --git a/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest.bb b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest.bb new file mode 100644 index 0000000000..f458b761f2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-core/images/meta-networking-image-ptest.bb @@ -0,0 +1,40 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require recipes-core/images/core-image-minimal.bb +require conf/include/ptest-packagelists-meta-networking.inc + +SUMMARY = "meta-networking ptest test image" + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.openembedded.org/" + +PTESTS_META_NETWORKING = "${PTESTS_SLOW_META_NETWORKING} ${PTESTS_FAST_META_NETWORKING} ${PTESTS_PROBLEMS_META_NETWORKING}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS_META_NETWORKING').split()])}" + +# The image can be sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +# If a particular ptest needs more space, it can be customized: +#IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-<pn> = "1024288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +# If a particular ptest needs more memroy, it can be customized: +#QB_MEM:virtclass-mcextend-<pn> = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + diff --git a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index bacf984e74..32c4783cf7 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -59,6 +59,7 @@ FILES:${PN}-libs = "${libdir}/${BPN}/*.so /usr/lib/${BPN}/*.so" INSANE_SKIP:${PN}-libs = "dev-so" RDEPENDS:${PN} += "${PN}-libs" +RDEPENDS:${PN}-ptest += "packagegroup-core-buildessential" PACKAGECONFIG ??= "libgcrypt non32bit snmp-bc" PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils," diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.7.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.7.bb index 519ece80f1..a4932cd36c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.7.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.7.bb @@ -143,4 +143,4 @@ FILES:${PN}-conf += "${sysconfdir}/squid" FILES:${PN}-networkmanager = "${libdir}/NetworkManager/dispatcher.d" RDEPENDS:${PN} += "perl ${PN}-conf" -RDEPENDS:${PN}-ptest += "perl make" +RDEPENDS:${PN}-ptest += "perl make bash" 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 d99d7016b2..d57cb977e4 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 @@ -36,7 +36,9 @@ do_install_ptest() { sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-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}-logging \ - ${PYTHON_PN}-difflib" +RDEPENDS:${PN} = "tcpdump python3-compression python3-cryptography python3-netclient \ + python3-netserver python3-pydoc python3-pkgutil python3-shell \ + python3-threading python3-numbers python3-fcntl python3-logging \ + python3-difflib" +RDEPENDS:${PN}-ptest += "python3-json python3-mock python3-multiprocessing \ + iproute2 tshark" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch deleted file mode 100644 index f8697699ac..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +++ /dev/null @@ -1,33 +0,0 @@ -From be1b3d2d0f1608cba5efee73d6aac5ad0709041b Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe_macdonald@mentor.com> -Date: Tue, 9 Sep 2014 10:24:58 -0400 -Subject: [PATCH] Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - ---- -Upstream-Status: Pending - - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 73ea23e..ed3eeb9 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,8 +60,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI - idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2` - ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack` - ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack` --lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.2` --lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` -+lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua` -+lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua` - nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags 'nettle hogweed' \ - HAVE_CRYPTOHASH $(PKG_CONFIG) --cflags nettle \ - HAVE_NETTLEHASH $(PKG_CONFIG) --cflags nettle` - --- -2.9.5 - diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.89.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb index 684eb44320..38fa271dc3 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.89.bb +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb @@ -11,15 +11,13 @@ DEPENDS += "gettext-native" #at least versions 2.69 and prior are moved to the archive folder on the server SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ - file://lua.patch \ file://init \ file://dnsmasq.conf \ file://dnsmasq-resolvconf.service \ file://dnsmasq-noresolvconf.service \ file://dnsmasq-resolved.conf \ - file://CVE-2023-28450.patch \ " -SRC_URI[sha256sum] = "8651373d000cae23776256e83dcaa6723dee72c06a39362700344e0c12c4e7e4" +SRC_URI[sha256sum] = "8f6666b542403b5ee7ccce66ea73a4a51cf19dd49392aaccd37231a2c51b303b" inherit pkgconfig update-rc.d systemd diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch deleted file mode 100644 index 129c9043e8..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/CVE-2023-28450.patch +++ /dev/null @@ -1,48 +0,0 @@ -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Tue, 7 Mar 2023 22:07:46 +0000 -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. - -http://www.dnsflagday.net/2020/ refers. - -Thanks to Xiang Li for the prompt. - -CVE: CVE-2023-28450 -Upstream-Status: Backport [https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5] - -Signed-off-by: Peter Marko <peter.marko@siemens.com> ---- - man/dnsmasq.8 | 3 ++- - src/config.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 41e2e04..5acb935 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. - .TP - .B \-P, --edns-packet-max=<size> - Specify the largest EDNS.0 UDP packet which is supported by the DNS --forwarder. Defaults to 4096, which is the RFC5625-recommended size. -+forwarder. Defaults to 1232, which is the recommended size following the -+DNS flag day in 2020. Only increase if you know what you are doing. - .TP - .B \-Q, --query-port=<query_port> - Send outbound DNS queries from, and listen for their replies on, the -diff --git a/src/config.h b/src/config.h -index 1e7b30f..37b374e 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -19,7 +19,7 @@ - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ --- -2.20.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/dropwatch/dropwatch/0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch b/meta-openembedded/meta-networking/recipes-support/dropwatch/dropwatch/0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch new file mode 100755 index 0000000000..33b72e05f0 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/dropwatch/dropwatch/0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch @@ -0,0 +1,28 @@ +From 4872c52f55f9cb089e6681c3f1926663145b52ae Mon Sep 17 00:00:00 2001 +From: chenheyun <chen_heyun@163.com> +Date: Sun, 18 Feb 2024 05:08:25 -0800 +Subject: [PATCH] fix bug: build with sysroot head file instead of local head + file:net_dropmon.h + +Signed-off-by: chenheyun <chen_heyun@163.com> +--- + src/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index e4746d9..81dc4da 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -26,8 +26,8 @@ + #include <netlink/netlink.h> + #include <netlink/genl/genl.h> + #include <netlink/genl/ctrl.h> ++#include <net_dropmon.h> + +-#include "net_dropmon.h" + #include "lookup.h" + + /* +-- +2.25.1 + 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 index e3dbac4a26..baa9398a18 100644 --- 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 @@ -8,7 +8,9 @@ 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" +SRC_URI = "git://github.com/nhorman/dropwatch.git;protocol=https;nobranch=1 \ + file://0001-fix-bug-build-with-sysroot-head-file-instead-of-loca.patch \ +" SRCREV = "1e7e487a019a7c02f1f429c4d3a4647fa3787a13" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.19.0.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.19.1.bb index ed8c5bd97c..2b87de3d18 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.19.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.19.1.bb @@ -9,8 +9,8 @@ SECTION = "net" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" -SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master" -SRCREV = "3352b1090ea1098883f6bf64236fa877e18e458b" +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.19.1" +SRCREV = "c6dd1e116df75242a0c032295c152f06c721b3cd" inherit autotools pkgconfig systemd update-rc.d diff --git a/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb b/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb new file mode 100644 index 0000000000..9da43cf9f4 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb @@ -0,0 +1,28 @@ +SUMMARY = "wavemon is a wireless device monitoring application" +HOMEPAGE = "https://github.com/uoaerg/wavemon" +DESCRIPTION = "wavemon is a wireless device monitoring application that \ + allows you to watch signal and noise levels, packet \ + statistics, device configuration and network parameters of \ + your wireless network hardware." + +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" + +PACKAGECONFIG ??= "cap" +PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" + +DEPENDS = "libnl ncurses" + +SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" +SRCREV = "a7c2f190e010db508ead31fa952478e2a1c13d64" + +# Needs some help to find libnl3 headers. +# Reorder -pthread flag on the command line. +EXTRA_OEMAKE = "\ + CC='${CC}' CFLAGS='${CFLAGS} -pthread -I${STAGING_INCDIR}/libnl3' \ +" + +S = "${WORKDIR}/git" + +# wavemon does not support using out-of-tree builds +inherit autotools-brokensep pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.2.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.3.bb index a2ab112e9d..28a3794454 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.3.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] = "9e3672be8c6caf9279a5a13582d6711ab699ae2a79323e92a99409c1ead98521" +SRC_URI[sha256sum] = "958bd5996f543d91779b1a4e7e952dcd7b0245fe82194202c3333a8f78795811" PE = "1" diff --git a/meta-openembedded/meta-oe/classes/signing.bbclass b/meta-openembedded/meta-oe/classes/signing.bbclass index 553d74e283..ec076d9685 100644 --- a/meta-openembedded/meta-oe/classes/signing.bbclass +++ b/meta-openembedded/meta-oe/classes/signing.bbclass @@ -142,10 +142,10 @@ signing_import_cert_from_pem() { signing_pkcs11_tool --type cert --write-object /proc/self/fd/0 --label "${role}" } -# signing_import_pubkey_from_der <role> <pem> +# signing_import_pubkey_from_der <role> <der> # # Import a public key from DER file to a role. To be used with SoftHSM. -signing_import_pubkey_from_pem() { +signing_import_pubkey_from_der() { local role="${1}" local der="${2}" @@ -171,7 +171,7 @@ signing_import_pubkey_from_pem() { signing_pkcs11_tool --type pubkey --write-object /proc/self/fd/0 --label "${role}" } -# signing_import_privkey_from_der <role> <pem> +# signing_import_privkey_from_der <role> <der> # # Import a private key from DER file to a role. To be used with SoftHSM. signing_import_privkey_from_der() { diff --git a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 06c7de3f8b..a0e23bec42 100644 --- a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -71,3 +71,6 @@ PTESTS_PROBLEMS_META_OE ="\ psqlodbc \ pv \ " + +PTESTS_PROBLEMS_META_OE:remove:riscv64 = "oprofile" +PTESTS_PROBLEMS_META_OE:remove:riscv32 = "oprofile" diff --git a/meta-openembedded/meta-oe/files/static-group-meta-oe b/meta-openembedded/meta-oe/files/static-group-meta-oe index f20c86f653..543c893c00 100644 --- a/meta-openembedded/meta-oe/files/static-group-meta-oe +++ b/meta-openembedded/meta-oe/files/static-group-meta-oe @@ -5,4 +5,5 @@ mysql:x:603: postgres:x:28: zabbix:x:605: mail:x:606: +influxdb:x:622: nogroup:x:65534: diff --git a/meta-openembedded/meta-oe/files/static-passwd-meta-oe b/meta-openembedded/meta-oe/files/static-passwd-meta-oe index 00f3e107e9..daf686b930 100644 --- a/meta-openembedded/meta-oe/files/static-passwd-meta-oe +++ b/meta-openembedded/meta-oe/files/static-passwd-meta-oe @@ -7,5 +7,5 @@ zabbix:x:605:605::/:/bin/nologin cyrus:x:606:nogroup::/:/bin/nologin pcp:x:620:nogroup::/:/bin/nologin pcpqa:x:621:nogroup::/:/bin/nologin -influxdb:x:622:nogroup::/:/bin/nologin -mongodb:x:623:nogroup::/:/bin/nologin
\ No newline at end of file +influxdb:x:622:influxdb::/var/lib/influxdb:/bin/nologin +mongodb:x:623:nogroup::/:/bin/nologin 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 f54d833a01..7ad28d594d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb @@ -4,8 +4,7 @@ SECTION = "libs/network" LICENSE = "GPL-2.0-or-later | BSD-3-Clause" LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=a87ee154f005a6f035b8b34ac2191f3b" -DEPENDS = "bluez5 glib-2.0" -DEPENDS += "glib-2.0-native" +DEPENDS = "bluez5 glib-2.0 glib-2.0-native python3-packaging-native" PV = "0.2+git" @@ -26,7 +25,7 @@ PACKAGECONFIG[force-dbus] = "-DGATTLIB_FORCE_DBUS=TRUE,-DGATTLIB_FORCE_DBUS=FALS EXTRA_OECMAKE += "-DGATTLIB_PYTHON_INTERFACE=OFF" EXTRA_OECMAKE += "-DGATTLIB_BUILD_DOCS=OFF" -inherit pkgconfig cmake +inherit pkgconfig cmake python3native do_compile:append() { for f in org-bluez-gattdescriptor1.c org-bluez-battery1.c org-bluez-adaptater1.c \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.13.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.14.bb index 687dc41c61..f190ef1988 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.13.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.14.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] = "5c58d0cc7c2c81540a515a7487330468c61615d23031af47be15f694fbfbc8b3" +SRC_URI[sha256sum] = "830184db5d3885ac68701cd8bb1c04d0bd8c8d3ab1c82b893b5e2bdf23329f28" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb index e8e1750b0e..da942e8bee 100644 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest-all.bb @@ -9,7 +9,7 @@ REQUIRED_DISTRO_FEATURES = "ptest" require conf/include/ptest-packagelists-meta-oe.inc # Include the full set of ptests -PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE}" +PTESTS_META_OE = "${PTESTS_FAST_META_OE} ${PTESTS_SLOW_META_OE} ${PTESTS_PROBLEMS_META_OE}" do_testimage[noexec] = "1" do_testimage[depends] = "${@' '.join(['meta-oe-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_OE').split()])}" diff --git a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb index 4cd1f4497c..b32df0e221 100644 --- a/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb +++ b/meta-openembedded/meta-oe/recipes-core/images/meta-oe-image-ptest.bb @@ -9,7 +9,7 @@ SUMMARY = "meta-oe ptest test image" DESCRIPTION += "Also including the ${MCNAME} ptest package." HOMEPAGE = "https://www.openembedded.org/" -PTESTS_META_OE = "${PTESTS_SLOW_META_OE} ${PTESTS_FAST_META_OE}" +PTESTS_META_OE = "${PTESTS_SLOW_META_OE} ${PTESTS_FAST_META_OE} ${PTESTS_PROBLEMS_META_OE}" IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" 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 740835b217..6e2012daea 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 @@ -874,6 +874,7 @@ RDEPENDS:packagegroup-meta-oe-support ="\ raptor2 \ rdfind \ re2 \ + sdmon \ sdparm \ serial-forward \ read-edid \ diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb index 7f8110e4c1..0770e4bebb 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb @@ -45,7 +45,7 @@ do_install:prepend() { do_install:append() { install -d ${D}${sysconfdir}/influxdb install -m 0644 ${WORKDIR}/influxdb.conf ${D}${sysconfdir}/influxdb - chown -R root.influxdb ${D}${sysconfdir}/influxdb + chown -R root:influxdb ${D}${sysconfdir}/influxdb install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/influxdb ${D}${sysconfdir}/init.d/influxdb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb index 578357b480..578357b480 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 25dc15b466..9e6d490cbe 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -23,9 +23,10 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ + file://0001-Remove-the-compile_time_assert-lines.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "1c0163463e98d71f4780741611a40981eee2bc44d392601ca49bbf948d04dd67" +SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" @@ -96,6 +97,7 @@ EXTRA_OECMAKE = "-DWITH_EMBEDDED_SERVER=ON \ -DMYSQL_DATADIR:PATH=/var/mysql \ -DCAT_EXECUTABLE=`which cat` \ -DSTACK_DIRECTION=1 \ + -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \ -DCMAKE_AR:FILEPATH=${AR}" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch new file mode 100644 index 0000000000..9a6e28297b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch @@ -0,0 +1,43 @@ +From cc5f1d0759b367265a1a000287e2ec15c31eb518 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 26 Feb 2024 14:56:02 +0800 +Subject: [PATCH] Remove the compile_time_assert lines + +Remove the problematic compile_time_assert lines to fix the below build +failure on 32-bit arm. + In file included from TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_test.c:38: + TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_fw.c:1438:3: error: 'compile_time_assert' declared as an array with a negative size + 1438 | compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Inappropriate [Upstream will bring the asset back + in a new way [1]] +[1] https://jira.mariadb.org/browse/MDEV-33429 + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + tests/mysql_client_fw.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c +index c9e64678..5c0c7ce2 100644 +--- a/tests/mysql_client_fw.c ++++ b/tests/mysql_client_fw.c +@@ -1430,14 +1430,6 @@ int main(int argc, char **argv) + tests_to_run[i]= NULL; + } + +-#ifdef _WIN32 +- /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */ +- compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728); +-#else +- /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */ +- compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); +-#endif +- + if (mysql_server_init(embedded_server_arg_count, + embedded_server_args, + (char**) embedded_server_groups)) +-- +2.25.1 + 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.7.bb index b1d1355e2b..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.7.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.1.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.2.0.bb index ac8094d118..deb459ce57 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.2.0.bb @@ -3,10 +3,10 @@ HOMEPAGE = "http://www.mpich.org/" SECTION = "devel" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f1804c45b8b4e816e53eb1f175d810f3" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7a88f0d96d0d7396a7c66bf353235b62" SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" -SRC_URI[sha256sum] = "3492e98adab62b597ef0d292fb2459b6123bc80070a8aa0a30be6962075a12f0" +SRC_URI[sha256sum] = "a64a66781b9e5312ad052d32689e23252f745b27ee8818ac2ac0c8209bc0b90e" RDEPENDS:${PN} += "bash perl libxml2" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.25.2.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb index 6cd44a4e78..3241345963 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.25.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib abseil-cpp" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "a9b006bddd52e289029f16aa77b77e8e0033d9ee" +SRCREV = "4a2aef570deb2bfb8927426558701e8bfc26f2a4" SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \ file://run-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.8.2.bb b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.8.3.bb index 5df494fa73..d12130af43 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/sip/sip_6.8.3.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303" inherit pypi setuptools3 python3native PYPI_PACKAGE = "sip" -SRC_URI[sha256sum] = "2e65a423037422ccfde095c257703a8ff45cc1c89bdaa294d7819bc836c87639" +SRC_URI[sha256sum] = "888547b018bb24c36aded519e93d3e513d4c6aa0ba55b7cc1affbd45cf10762c" RDEPENDS:${PN} = " \ python3-core \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-yasm-Set-build-date-to-SOURCE_DATE_EPOCH.patch b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-yasm-Set-build-date-to-SOURCE_DATE_EPOCH.patch new file mode 100644 index 0000000000..e65c9853e0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0001-yasm-Set-build-date-to-SOURCE_DATE_EPOCH.patch @@ -0,0 +1,35 @@ +From eb164bb201c0f792fa8aa78270c47294065183a3 Mon Sep 17 00:00:00 2001 +From: Oleh Matiusha <omatiush@cisco.com> +Date: Tue, 6 Feb 2024 09:33:11 +0000 +Subject: [PATCH 1/2] yasm: Set build date to SOURCE_DATE_EPOCH + +If SOURCE_DATE_EPOCH is set, use it to generate a reproducible +string for BUILD_DATE. + +Signed-off-by: Oleh Matiusha <omatiush@cisco.com> +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 2823ecd..eeb51ce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -103,6 +103,14 @@ AM_WITH_DMALLOC + # + AC_CHECK_HEADERS([strings.h libgen.h unistd.h direct.h sys/stat.h]) + ++# Use reproducible build date and time ++if test "$SOURCE_DATE_EPOCH"; then ++ DATE_FMT="%d %b %Y %H:%M:%S" ++ BUILD_DATE=$(LC_ALL=C date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT") ++ AC_DEFINE_UNQUOTED([BUILD_DATE], ["$BUILD_DATE"], [Use reproducidle build date]) ++fi ++ ++ + # + # Checks for typedefs, structures, and compiler characteristics. + # +-- +2.33.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0002-yasm-Use-BUILD_DATE-for-reproducibility.patch b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0002-yasm-Use-BUILD_DATE-for-reproducibility.patch new file mode 100644 index 0000000000..665f3afc9f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm/0002-yasm-Use-BUILD_DATE-for-reproducibility.patch @@ -0,0 +1,40 @@ +From 19fffab74a201dc41c3da7e74d86eafa8f68bbc6 Mon Sep 17 00:00:00 2001 +From: Oleh Matiusha <omatiush@cisco.com> +Date: Tue, 6 Feb 2024 09:34:26 +0000 +Subject: [PATCH] yasm: Use BUILD_DATE for reproducibility + +Use reproducible build date instead of compilation time and date. + +Signed-off-by: Oleh Matiusha <omatiush@cisco.com> + +--- + tools/re2c/parser.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/tools/re2c/parser.c b/tools/re2c/parser.c +index 02d5c66..1c90aee 100644 +--- a/tools/re2c/parser.c ++++ b/tools/re2c/parser.c +@@ -5,6 +5,7 @@ + #include "tools/re2c/globals.h" + #include "tools/re2c/parse.h" + #include "tools/re2c/parser.h" ++#include "config.h" + + int yylex(void); + static RegExp *parse_expr(void); +@@ -233,7 +234,11 @@ void parse(FILE *i, FILE *o){ + peektok = NONE; + + fputs("/* Generated by re2c 0.9.1-C on ", o); ++#ifndef BUILD_DATE + fprintf(o, "%-24s", ctime(&now)); ++#else ++ fprintf(o, "%-24s", BUILD_DATE " "); ++#endif + fputs(" */\n", o); oline+=2; + + in = Scanner_new(i); +-- +2.33.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb index 079f805d6c..216b777667 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/yasm/yasm_git.bb @@ -14,6 +14,8 @@ SRC_URI = "git://github.com/yasm/yasm.git;branch=master;protocol=https \ file://0001-Do-not-use-AC_HEADER_STDC.patch \ file://CVE-2023-31975.patch \ file://CVE-2023-37732.patch \ + file://0001-yasm-Set-build-date-to-SOURCE_DATE_EPOCH.patch \ + file://0002-yasm-Use-BUILD_DATE-for-reproducibility.patch \ " S = "${WORKDIR}/git" @@ -30,3 +32,4 @@ do_configure:prepend() { # Don't include $CC (which includes path to sysroot) in generated header. sed -i -e "s/^echo \"\/\* generated \$ac_cv_stdint_message \*\/\" >>\$ac_stdint$"// ${S}/m4/ax_create_stdint_h.m4 } + diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb index 4f8ea64a26..5f2993dd4f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb @@ -25,12 +25,12 @@ do_install () { oe_runmake install } -PACKAGES += "${PYTHON_PN}-${BPN}" +PACKAGES += "python3-${BPN}" -RPROVIDES:${BPN}-dbg += "${PYTHON_PN}-${BPN}-dbg" +RPROVIDES:${BPN}-dbg += "python3-${BPN}-dbg" -FILES:${PYTHON_PN}-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" +FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" -SRCREV = "7860901f726f5d92689cb67243cc7f981f21f74b" +SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb index 4454496f6c..f08fea7de3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb @@ -26,7 +26,7 @@ export BUILD_SYS export HOST_SYS EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ - --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \ + --with-python-binary=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ --with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR} \ --libdir=${libdir} \ --with-securedir=${base_libdir}/security \ diff --git a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.9.bb b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb index 00dc2fb1d0..2efaa2b3c6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ba882fa9b4b6b217a51780be3f4db9c8" RDEPENDS:${PN} = "perl" SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" -SRC_URI[sha256sum] = "49d2f1e99c9770f56fc3e82a46880e8900b874dfba593e45f599c89fd255738e" +SRC_URI[sha256sum] = "329df0991b879764ed7e50a869de5b6bfa70d241eb254397a5659d1ff5f2588f" do_install() { install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts 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 37bd36432f..4d3baf6caa 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -48,20 +48,20 @@ BINDINGS:armv4 ??= "python" BINDINGS:armv5 ??= "python" PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ - ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" + ${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}" -PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," +PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native python3," PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF -DFTDI4222=OFF,, libft4222" -FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/" -RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" +FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/" +RDEPENDS:python3-${PN} += "python3" FILES:node-${PN} = "${prefix}/lib/node_modules/" RDEPENDS:node-${PN} += "nodejs" ### Include desired language bindings ### PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" -PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" +PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}" TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.1.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.3.bb index d4ad765c08..158ec9bc23 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.3.bb @@ -22,14 +22,12 @@ 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] = "152327fe804512d4f896fb9b9e9cdc84ad9b4c0b205b8625472147d5a28164af" +SRC_URI[sha256sum] = "5e0daaaa70772bfa00bd3d0c25d11f7c1f6d41a996708fad8bf9941f0a36bc8d" S = "${WORKDIR}/libostree-${PV}" inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd -COMPATIBLE_HOST:riscv32 = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'null', 'riscv32', d)}" - UNKNOWN_CONFIGURE_OPT_IGNORE = "--disable-introspection --enable-introspection" # Workaround compile failure: @@ -203,6 +201,7 @@ RDEPENDS:${PN}-ptest += " \ python3-pyyaml \ ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ " +RDEPENDS:${PN}-ptest:remove:riscv32 = "strace" RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils glibc-localedata-en-us" RRECOMMENDS:${PN}:append:class-target = " kernel-module-overlay" 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 8468ff775d..3aa766d0bd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/upm/upm_git.bb @@ -42,21 +42,21 @@ BINDINGS:armv4 ??= "python" BINDINGS:armv5 ??= "python" PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ - ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" + ${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}" -PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," +PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native python3," PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," do_configure:prepend() { sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake } -FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" -RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" +FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" +RDEPENDS:python3-${PN} += "python3" FILES:node-${PN} = "${prefix}/lib/node_modules/" RDEPENDS:node-${PN} += "nodejs" ### Include desired language bindings ### PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" -PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" +PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/wayland/libei_1.2.0.bb b/meta-openembedded/meta-oe/recipes-graphics/wayland/libei_1.2.1.bb index aba49de7e3..807dcea1ed 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/wayland/libei_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/wayland/libei_1.2.1.bb @@ -17,7 +17,7 @@ DEPENDS = " \ SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "493631688437657a87e9169a76f14a3216c0024f" +SRCREV = "08f1d41085a6ae4bac7bc52abe2955d3354342cb" inherit meson pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch b/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch index 5f2ecc1417..f2755d5c08 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Fixed-swig-host-contamination-issue.patch @@ -1,4 +1,4 @@ -From 9a32d42dfc6713fd0085dd4563a934afc30ec097 Mon Sep 17 00:00:00 2001 +From 5cdc667aeb7a014cdc1f8c7df8f8080408773dbe Mon Sep 17 00:00:00 2001 From: Li xin <lixin.fnst@cn.fujitsu.com> Date: Sun, 19 Jul 2015 02:42:58 +0900 Subject: [PATCH] Fixed swig host contamination issue @@ -19,7 +19,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bindings/swig/python3/Makefile.am b/bindings/swig/python3/Makefile.am -index 6131e80d..2fb7207b 100644 +index c2c6def4..bcc2836c 100644 --- a/bindings/swig/python3/Makefile.am +++ b/bindings/swig/python3/Makefile.am @@ -23,6 +23,7 @@ @@ -28,9 +28,9 @@ index 6131e80d..2fb7207b 100644 AM_CPPFLAGS = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) +STDINC ?= /usr/include LIBS = $(top_builddir)/lib/libaudit.la - SWIG_FLAGS = -python -py3 -modern + SWIG_FLAGS = -python SWIG_INCLUDES = -I. -I$(top_builddir) -I${top_srcdir}/lib $(PYTHON3_INCLUDES) -@@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/libaudit.h ${top_builddir}/lib/libaudi +@@ -37,7 +38,7 @@ _audit_la_DEPENDENCIES =${top_srcdir}/lib/audit_logging.h ${top_builddir}/lib/li _audit_la_LIBADD = ${top_builddir}/lib/libaudit.la nodist__audit_la_SOURCES = audit_wrap.c audit.py audit_wrap.c: ${srcdir}/../src/auditswig.i @@ -40,18 +40,18 @@ index 6131e80d..2fb7207b 100644 CLEANFILES = audit.py* audit_wrap.c *~ diff --git a/bindings/swig/src/auditswig.i b/bindings/swig/src/auditswig.i -index 9a2c5661..6cbb7295 100644 +index 6b267844..5a4e442f 100644 --- a/bindings/swig/src/auditswig.i +++ b/bindings/swig/src/auditswig.i -@@ -43,7 +43,7 @@ typedef unsigned uid_t; - * generating setters against them: https://github.com/swig/swig/issues/1699 +@@ -50,7 +50,7 @@ typedef unsigned uid_t; */ %ignore audit_rule_data::buf; + -%include "/usr/include/linux/audit.h" +%include "../lib/audit.h" #define __extension__ /*nothing*/ %include <stdint.i> - %include "../lib/libaudit.h" + %include "../lib/audit-records.h" -- 2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/0002-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch index 7f0af74a8c..b1f324f22d 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit/0002-Replace-__attribute_malloc__-with-__attribute__-__ma.patch +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch @@ -1,4 +1,4 @@ -From 679cb57fa93984fed345dd3890cdbcbaa24e8518 Mon Sep 17 00:00:00 2001 +From 88c9b2c5cebebf13f90890baebbadc60d9fe8d16 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 9 Aug 2022 23:57:03 -0700 Subject: [PATCH] Replace __attribute_malloc__ with __attribute__((__malloc__)) @@ -14,14 +14,28 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - auparse/auparse.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + audisp/plugins/remote/queue.h | 2 +- + auparse/auparse.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h +index 36b70d04..031507dc 100644 +--- a/audisp/plugins/remote/queue.h ++++ b/audisp/plugins/remote/queue.h +@@ -53,7 +53,7 @@ void q_close(struct queue *q); + * On error, return NULL and set errno. */ + struct queue *q_open(int q_flags, const char *path, size_t num_entries, + size_t entry_size) +- __attribute_malloc__ __attr_dealloc (q_close, 1) __wur; ++ __attribute__((__malloc__)) __attr_dealloc (q_close, 1) __wur; + + /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */ + int q_append(struct queue *q, const char *data); diff --git a/auparse/auparse.h b/auparse/auparse.h -index 5cb7402e..39156eff 100644 +index c27f1ff9..87c52965 100644 --- a/auparse/auparse.h +++ b/auparse/auparse.h -@@ -54,7 +54,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, +@@ -55,7 +55,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, void auparse_destroy(auparse_state_t *au); void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what); auparse_state_t *auparse_init(ausource_t source, const void *b) diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/0002-Add-attribute-declarations.patch b/meta-openembedded/meta-oe/recipes-security/audit/audit/0002-Add-attribute-declarations.patch new file mode 100644 index 0000000000..349142580a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit/0002-Add-attribute-declarations.patch @@ -0,0 +1,35 @@ +From 64cb48e1e5137b8a389c7528e611617a98389bc7 Mon Sep 17 00:00:00 2001 +From: Steve Grubb <ausearch.1@gmail.com> +Date: Thu, 25 Jan 2024 15:14:51 -0500 +Subject: [PATCH] Add attribute declarations + +Upstream-Status: Backport +[https://github.com/linux-audit/audit-userspace/commit/64cb48e1e5137b8a389c7528e611617a98389bc7] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + audisp/plugins/remote/queue.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h +index 36b70d04..2c70e839 100644 +--- a/audisp/plugins/remote/queue.h ++++ b/audisp/plugins/remote/queue.h +@@ -1,5 +1,5 @@ + /* queue.h -- a queue abstraction +- * Copyright 2009, 2011 Red Hat Inc., Durham, North Carolina. ++ * Copyright 2009, 2011 Red Hat Inc. + * All Rights Reserved. + * + * This library is free software; you can redistribute it and/or +@@ -25,6 +25,7 @@ + #define QUEUE_HEADER + + #include <sys/types.h> ++#include "common.h" // attribute decls + + struct queue; + +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd.service b/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd.service deleted file mode 100644 index 06c63f0e5e..0000000000 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit/auditd.service +++ /dev/null @@ -1,28 +0,0 @@ -[Unit] -Description=Security Auditing Service -DefaultDependencies=no -After=local-fs.target systemd-tmpfiles-setup.service -Before=sysinit.target shutdown.target -Conflicts=shutdown.target -ConditionKernelCommandLine=!audit=0 - -[Service] -Type=forking -PIDFile=/run/auditd.pid -ExecStart=/sbin/auditd -## To use augenrules, uncomment the next line and comment/delete the auditctl line. -## NOTE: augenrules expect any rules to be added to /etc/audit/rules.d/ -#ExecStartPost=-/sbin/augenrules --load -ExecStartPost=-/sbin/auditctl -R /etc/audit/audit.rules -# By default we don't clear the rules on exit. -# To enable this, uncomment the next line. -#ExecStopPost=/sbin/auditctl -R /etc/audit/audit-stop.rules - -### Security Settings ### -MemoryDenyWriteExecute=true -LockPersonality=true -ProtectControlGroups=true -ProtectKernelModules=true - -[Install] -WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb deleted file mode 100644 index 7136ed6a4c..0000000000 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_3.1.2.bb +++ /dev/null @@ -1,116 +0,0 @@ -SUMMARY = "User space tools for kernel auditing" -DESCRIPTION = "The audit package contains the user space utilities for \ -storing and searching the audit records generated by the audit subsystem \ -in the Linux kernel." -HOMEPAGE = "http://people.redhat.com/sgrubb/audit/" -SECTION = "base" -LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ - file://0001-Fixed-swig-host-contamination-issue.patch \ - file://0002-Replace-__attribute_malloc__-with-__attribute__-__ma.patch \ - file://auditd \ - file://auditd.service \ - file://audit-volatile.conf \ -" - -S = "${WORKDIR}/git" -SRCREV = "572eb7d4fe926e7c1c52166d08e78af54877cbc5" - -inherit autotools python3targetconfig update-rc.d systemd - -UPDATERCPN = "auditd" -INITSCRIPT_NAME = "auditd" -INITSCRIPT_PARAMS = "defaults" - -SYSTEMD_PACKAGES = "auditd" -SYSTEMD_SERVICE:auditd = "auditd.service" - -DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native python3-setuptools-native" - -EXTRA_OECONF = " --with-libwrap \ - --enable-gssapi-krb5=no \ - --with-libcap-ng=yes \ - --with-python3=yes \ - --libdir=${base_libdir} \ - --sbindir=${base_sbindir} \ - --without-python \ - --without-golang \ - --disable-zos-remote \ - --with-arm=yes \ - --with-aarch64=yes \ - " - -EXTRA_OEMAKE = "PYLIBVER='python${PYTHON_BASEVERSION}' \ - PYINC='${STAGING_INCDIR}/$(PYLIBVER)' \ - pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ - STDINC='${STAGING_INCDIR}' \ - pkgconfigdir=${libdir}/pkgconfig \ - " - -SUMMARY:audispd-plugins = "Plugins for the audit event dispatcher" -DESCRIPTION:audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ -interface to the audit system, audispd. These plugins can do things \ -like relay events to remote machines or analyze events for suspicious \ -behavior." - -PACKAGES =+ "audispd-plugins" -PACKAGES += "auditd ${PN}-python" - -FILES:${PN} = "${sysconfdir}/libaudit.conf ${base_libdir}/libaudit.so.1* ${base_libdir}/libauparse.so.*" -FILES:auditd = "${bindir}/* ${base_sbindir}/* ${sysconfdir}/* ${datadir}/audit/*" -FILES:audispd-plugins = "${sysconfdir}/audit/audisp-remote.conf \ - ${sysconfdir}/audit/plugins.d/au-remote.conf \ - ${sysconfdir}/audit/plugins.d/syslog.conf \ - ${base_sbindir}/audisp-remote \ - ${base_sbindir}/audisp-syslog \ - ${localstatedir}/spool/audit \ - " -FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" -FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" - -CONFFILES:auditd = "${sysconfdir}/audit/audit.rules" - -do_configure:prepend() { - sed -e 's|buf\[];|buf[0];|g' ${STAGING_INCDIR}/linux/audit.h > ${S}/lib/audit.h - sed -i -e 's|#include <linux/audit.h>|#include "audit.h"|g' ${S}/lib/libaudit.h -} - -do_install:append() { - sed -i -e 's|#include "audit.h"|#include <linux/audit.h>|g' ${D}${includedir}/libaudit.h - - rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a - rm -f ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la - - # reuse auditd config - [ ! -e ${D}/etc/default ] && mkdir ${D}/etc/default - mv ${D}/etc/sysconfig/auditd ${D}/etc/default - rmdir ${D}/etc/sysconfig/ - - # replace init.d - install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd - rm -rf ${D}/etc/rc.d - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - # install systemd unit files - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/auditd.service ${D}${systemd_unitdir}/system - - install -d ${D}${sysconfdir}/tmpfiles.d/ - install -m 0644 ${WORKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ - fi - - # audit-2.5 doesn't install any rules by default, so we do that here - mkdir -p ${D}/etc/audit ${D}/etc/audit/rules.d - cp ${S}/rules/10-base-config.rules ${D}/etc/audit/rules.d/audit.rules - - chmod 750 ${D}/etc/audit ${D}/etc/audit/rules.d - chmod 640 ${D}/etc/audit/auditd.conf ${D}/etc/audit/rules.d/audit.rules - - # Based on the audit.spec "Copy default rules into place on new installation" - cp ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules - - # Create /var/spool/audit directory for audisp-remote - install -m 0700 -d ${D}${localstatedir}/spool/audit -} diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_4.0.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_4.0.bb new file mode 100644 index 0000000000..c8ab0d880d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_4.0.bb @@ -0,0 +1,103 @@ +SUMMARY = "User space tools for kernel auditing" +DESCRIPTION = "The audit package contains the user space utilities for \ +storing and searching the audit records generated by the audit subsystem \ +in the Linux kernel." +HOMEPAGE = "http://people.redhat.com/sgrubb/audit/" +SECTION = "base" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;protocol=https \ + file://0001-Fixed-swig-host-contamination-issue.patch \ + file://0002-Add-attribute-declarations.patch \ + file://auditd \ + file://audit-volatile.conf \ + " + +SRC_URI:append:libc-musl = " file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch" + +S = "${WORKDIR}/git" +SRCREV = "ae7d2830391c1115cebff6340ef3130b1b03ce45" + +inherit autotools python3targetconfig update-rc.d systemd + +UPDATERCPN = "auditd" +INITSCRIPT_NAME = "auditd" +INITSCRIPT_PARAMS = "defaults" + +SYSTEMD_PACKAGES = "auditd" +SYSTEMD_SERVICE:auditd = "auditd.service audit-rules.service" + +DEPENDS = "python3 tcp-wrappers libcap-ng linux-libc-headers swig-native python3-setuptools-native coreutils-native" + +EXTRA_OECONF = " \ + --with-libwrap \ + --with-libcap-ng \ + --with-python3 \ + --with-arm \ + --with-aarch64 \ + --without-golang \ + --disable-gssapi-krb5 \ + --disable-zos-remote \ + --sbindir=${base_sbindir} \ + " + +EXTRA_OEMAKE = " \ + PYTHON=python3 \ + pythondir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ + pyexecdir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ + STDINC='${STAGING_INCDIR}' \ + " + +SUMMARY:audispd-plugins = "Plugins for the audit event dispatcher" +DESCRIPTION:audispd-plugins = "The audispd-plugins package provides plugins for the real-time \ +interface to the audit system, audispd. These plugins can do things \ +like relay events to remote machines or analyze events for suspicious \ +behavior." + +PACKAGES =+ "audispd-plugins" +PACKAGES += "auditd ${PN}-python" + +FILES:${PN} = "${sysconfdir}/libaudit.conf ${libdir}/libau*.so.*" +FILES:auditd = "${bindir}/* ${base_sbindir}/* ${sysconfdir}/* ${datadir}/audit-rules/* ${libexecdir}/*" +FILES:audispd-plugins = "${sysconfdir}/audit/audisp-remote.conf \ + ${sysconfdir}/audit/plugins.d/au-remote.conf \ + ${sysconfdir}/audit/plugins.d/syslog.conf \ + ${base_sbindir}/audisp-remote \ + ${base_sbindir}/audisp-syslog \ + ${localstatedir}/spool/audit \ + " +FILES:${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/*/.debug" +FILES:${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}" + +CONFFILES:auditd = "${sysconfdir}/audit/audit.rules" + +do_configure:prepend() { + sed -e 's|buf\[];|buf[0];|g' ${STAGING_INCDIR}/linux/audit.h > ${S}/lib/audit.h + sed -i -e 's|#include <linux/audit.h>|#include "audit.h"|g' ${S}/lib/libaudit.h +} + +do_install:append() { + sed -i -e 's|#include "audit.h"|#include <linux/audit.h>|g' ${D}${includedir}/libaudit.h + + # Install default rules + install -d -m 750 ${D}/etc/audit + install -d -m 750 ${D}/etc/audit/rules.d + + install -m 0640 ${S}/rules/10-base-config.rules ${D}/etc/audit/rules.d/audit.rules + + # Based on the audit.spec "Copy default rules into place on new installation" + install -m 0640 ${D}/etc/audit/rules.d/audit.rules ${D}/etc/audit/audit.rules + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0644 ${WORKDIR}/audit-volatile.conf ${D}${sysconfdir}/tmpfiles.d/audit.conf + fi + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd + rm -rf ${D}${libdir}/systemd + fi + + # Create /var/spool/audit directory for audisp-remote + install -d -m 0700 ${D}${localstatedir}/spool/audit +} diff --git a/meta-openembedded/meta-oe/recipes-support/btop/btop_1.3.0.bb b/meta-openembedded/meta-oe/recipes-support/btop/btop_1.3.2.bb index f20d1a8ec4..c473bf0a35 100644 --- a/meta-openembedded/meta-oe/recipes-support/btop/btop_1.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/btop/btop_1.3.2.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 = "36842a3bccfb78f5c27642435bff387b42f7d13b" +SRCREV = "fd2a2acdad6fbaad76846cb5e802cf2ae022d670" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_0.25.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_0.25.bb index 3bdd445213..9f3fcc0087 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_0.25.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_0.25.bb @@ -43,19 +43,19 @@ PACKAGECONFIG[xml_backend] = "-DWITH_XML_BACKEND=ON,${XML_BACKEND_DISABLE},libxm PACKAGECONFIG[dnssd] = "-DHAVE_DNS_SD=ON,-DHAVE_DNS_SD=off,avahi" PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" -PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" +PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python3" -# Inheriting setuptools3 incorrectly adds the dependency on ${PYTHON_PN}-core -# to ${PN} instead of to ${PN}-${PYTHON_PN} where it belongs. -RDEPENDS:${PN}:remove = "${PYTHON_PN}-core" -RDEPENDS:${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-core ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" +# Inheriting setuptools3 incorrectly adds the dependency on python3-core +# to ${PN} instead of to ${PN}-python3 where it belongs. +RDEPENDS:${PN}:remove = "python3-core" +RDEPENDS:${PN}-python3 = "${PN} python3-core python3-ctypes python3-stringold" FILES:${PN}-iiod = " \ ${sbindir}/iiod \ ${systemd_system_unitdir}/iiod.service \ " FILES:${PN}-tests = "${bindir}" -FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" SYSTEMD_PACKAGES = "${PN}-iiod" SYSTEMD_SERVICE:${PN}-iiod = "iiod.service" diff --git a/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.6.bb b/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb index 5509b0bb09..db05422699 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libevdev libgudev" SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz" -SRC_URI[sha256sum] = "63653259a821ec7d90d681e52e757e2219d462828c9d74b056a5f53267636bac" +SRC_URI[sha256sum] = "cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51" inherit meson pkgconfig gobject-introspection ptest vala diff --git a/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb index 42b9d7e048..5969220a41 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb @@ -21,12 +21,12 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[disabledebug] = "--disable-debug,," PACKAGECONFIG[allboardconfigs] = "--with-board-configs,," PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},," -PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN},,${PYTHON_PN} ${PYTHON_PN}-native" +PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/python3-native/python3,,python3 python3-native" PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ - '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" + 'python3-libsoc-staticdev python3-libsoc', '', d)}" RDEPENDS:${PN} = "libgcc" -FILES:${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" -FILES:${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" +FILES:python3-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" +FILES:python3-libsoc += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb index b337df6ea4..6a93b2ec90 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -69,7 +69,7 @@ do_compile:prepend() { ${S}/src/include/builddefs sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile export PYTHON=python3 - #export PYTHON3=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} + #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3 } do_compile() { diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.33.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.34.bb index 590f5089e5..921d34d9fd 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.33.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.34.bb @@ -25,7 +25,7 @@ DEPENDS = " \ DEPENDS:append:libc-musl = " libexecinfo" LDFLAGS:append:libc-musl = " -lexecinfo" -SRCREV = "2c4e1479433e51418ecb6089f35182bfebc5b57e" +SRCREV = "75a0bdb795d99e052690178ae0d81ebdbd2cbdd3" SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/sdmon/sdmon_git.bb b/meta-openembedded/meta-oe/recipes-support/sdmon/sdmon_git.bb new file mode 100644 index 0000000000..522539a67b --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/sdmon/sdmon_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "Get SD card health data" +HOMEPAGE = "https://github.com/Ognian/sdmon" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/Ognian/sdmon;protocol=https;branch=master" + +PV = "0.8.1+git" +SRCREV = "ef1aec457f04a50721f0259651cca9c946f11390" + +S = "${WORKDIR}/git" + +do_compile() { + oe_runmake -C ${S}/src CC="${CC}" CFLAGS="${CFLAGS} -D_REENTRANT -DVERSION=\"\\\"${PV}\\\"\"" LDFLAGS="${LDFLAGS}" +} + +do_install() { + install -Dm 0755 ${S}/src/sdmon ${D}${bindir}/sdmon +} diff --git a/meta-openembedded/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch b/meta-openembedded/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch new file mode 100644 index 0000000000..c763a9feb6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/unixodbc/files/0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch @@ -0,0 +1,54 @@ +From e886222c70d4b251f0785f670477b7aee938e5af Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Wed, 21 Feb 2024 13:55:41 +0800 +Subject: [PATCH] exe/Makefile.am: add CROSS_LAUNCHER to run odbc_config + +In case of cross compilation, the odbc_config cannot run, the error message +would be like below: + + /bin/bash: line 1: ../exe/odbc_config: cannot execute binary file: Exec format error + +Add CROSS_LAUNCHER to allow the possibility of running odbc_config correctly in +case of cross compilation. + +For example, here's a possible value for it (Yocto project environment, aarch64 target). + export CROSS_LAUNCHER="PSEUDO_UNLOAD=1 qemu-aarch64 -r 5.15 \ + -L /PATH/TO/unixodbc/2.3.11/recipe-sysroot \ + -E LD_LIBRARY_PATH=/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib:/PATH/TO/unixodbc/2.3.11/recipe-sysroot//usr/lib " + +Other projects can use the launcher they like to allow correct generation of +the odbc.pc file in cross compilation environment. + +Upstream-Status: Submitted [Personal Email, nick.gorham@easysoft.com] + +As said in the official website, https://www.unixodbc.org/, the way to report bug and send +out patch is via personal email. So there's a public link above. + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + exe/Makefile.am | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/exe/Makefile.am b/exe/Makefile.am +index 03f3d5a..5f33cf2 100644 +--- a/exe/Makefile.am ++++ b/exe/Makefile.am +@@ -59,11 +59,13 @@ slencheck_SOURCES = slencheck.c + dltest_DEPENDENCIES = $(LTDLDEPS) + dltest_LDADD = $(LIBLTDL) + ++CROSS_LAUNCHER ?= "" ++ + all-am: +- @sed "s![@]ODBC_ULEN[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ ++ @sed "s![@]ODBC_ULEN[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --ulen`!" \ + $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp + @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc +- @sed "s![@]ODBC_CFLAGS[@]!`$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ ++ @sed "s![@]ODBC_CFLAGS[@]!`$(CROSS_LAUNCHER)$(top_builddir)/exe/odbc_config$(EXEEXT) --cflags | sed 's/ -I.*//'`!" \ + $(top_builddir)/DriverManager/odbc.pc > $(top_builddir)/exe/odbc.pc.tmp + @mv -f $(top_builddir)/exe/odbc.pc.tmp $(top_builddir)/DriverManager/odbc.pc + +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb index 3a9e390a2b..0ab4f8864d 100644 --- a/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.11.bb @@ -10,23 +10,39 @@ DEPENDS = "libtool readline" SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ file://do-not-use-libltdl-source-directory.patch \ + file://0001-exe-Makefile.am-add-CROSS_LAUNCHER-to-run-odbc_confi.patch \ " SRC_URI[sha256sum] = "d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c" UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" -inherit autotools-brokensep multilib_header +inherit autotools-brokensep multilib_header qemu S = "${WORKDIR}/unixODBC-${PV}" EXTRA_OEMAKE += "LIBS=-lltdl" +DEPENDS:append:class-target = "${@' qemu-native' if bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', True, False, d) else ''}" +QEMU_WRAPPER = "${@qemu_wrapper_cmdline(d, '${STAGING_DIR_HOST}', ['${STAGING_DIR_HOST}/${libdir}','${STAGING_DIR_HOST}/${base_libdir}'])}" + do_configure:prepend() { # old m4 files will cause libtool version don't match rm -rf m4/* rm -fr libltdl } +do_compile:prepend() { + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then + export CROSS_LAUNCHER="${QEMU_WRAPPER} " + fi +} + +do_install:prepend() { + if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true', 'false', d)}; then + export CROSS_LAUNCHER="${QEMU_WRAPPER} " + fi +} + do_install:append() { oe_multilib_header unixodbc.h unixODBC/config.h unixODBC/unixodbc_conf.h } diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch new file mode 100644 index 0000000000..8909263fe4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch @@ -0,0 +1,38 @@ +From 6c4ff2210c36d6410ec287737d6a49f20c412332 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@redhat.com> +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?= + =?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?= + =?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6..9a2e2653 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.43.2 + diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.5.bb index 3c6b7db811..234ecfae0c 100644 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.42.5.bb @@ -14,8 +14,9 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://reproducibility.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ file://no-musttail-arm.patch \ + file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ " -SRC_URI[sha256sum] = "52288b30bda22373442cecb86f9c9a569ad8d4769a1f97b352290ed92a67ed86" +SRC_URI[sha256sum] = "b64278c1f20b8cfdbfb5ff573c37d871aba74a1db26d9b39f74e8953fe61e749" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen diff --git a/meta-openembedded/meta-perl/conf/include/ptest-packagelists-meta-perl.inc b/meta-openembedded/meta-perl/conf/include/ptest-packagelists-meta-perl.inc index bb6796f812..29a2b2e660 100644 --- a/meta-openembedded/meta-perl/conf/include/ptest-packagelists-meta-perl.inc +++ b/meta-openembedded/meta-perl/conf/include/ptest-packagelists-meta-perl.inc @@ -10,7 +10,9 @@ PTESTS_FAST_META_PERL = "\ libcapture-tiny-perl \ libcgi-perl \ libcrypt-openssl-random-perl \ + libdigest-hmac-perl \ libextutils-config-perl \ + libextutils-installpaths-perl \ libhtml-tagset-perl \ libmozilla-ca-perl \ libmodule-build-tiny-perl \ @@ -31,13 +33,10 @@ PTESTS_PROBLEMS_META_PERL ="\ libcrypt-openssl-rsa-perl \ libdata-hexdump-perl \ libdbd-sqlite-perl \ - libdigest-hmac-perl \ libdigest-sha1-perl \ libnet-dns-perl \ libnet-dns-sec-perl \ libnet-ldap-perl \ - libencode-perl \ - libextutils-installpaths-perl \ libfile-slurper-perl \ libhtml-parser-perl \ libmime-types-perl \ diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb index e2cafa98a5..9efe5087f0 100644 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest-all.bb @@ -9,7 +9,7 @@ REQUIRED_DISTRO_FEATURES = "ptest" require conf/include/ptest-packagelists-meta-perl.inc # Include the full set of ptests -PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL}" +PTESTS_META_PERL = "${PTESTS_FAST_META_PERL} ${PTESTS_SLOW_META_PERL} ${PTESTS_PROBLEMS_META_PERL}" do_testimage[noexec] = "1" do_testimage[depends] = "${@' '.join(['meta-perl-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PERL').split()])}" diff --git a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb index 7905977828..94d77b97f0 100644 --- a/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb +++ b/meta-openembedded/meta-perl/recipes-core/images/meta-perl-image-ptest.bb @@ -9,7 +9,7 @@ require conf/include/ptest-packagelists-meta-perl.inc DESCRIPTION += "Also including the ${MCNAME} ptest package." HOMEPAGE = "https://www.openembedded.org/" -PTESTS_META_PERL = "${PTESTS_SLOW_META_PERL} ${PTESTS_FAST_META_PERL}" +PTESTS_META_PERL = "${PTESTS_SLOW_META_PERL} ${PTESTS_FAST_META_PERL} ${PTESTS_PROBLEMS_META_PERL}" IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" diff --git a/meta-openembedded/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb b/meta-openembedded/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb index 2672ab584a..c49b3b5a27 100644 --- a/meta-openembedded/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb +++ b/meta-openembedded/meta-perl/recipes-core/packagegroups/packagegroup-meta-perl.bb @@ -100,6 +100,3 @@ RDEPENDS:packagegroup-meta-perl-ptest-packages = "\ " EXCLUDE_FROM_WORLD = "1" - -# perl-module-encode is preferred over libencode-perl -# libencode-locale-perl depends on libencode-perl diff --git a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-locale-perl_1.05.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-locale-perl_1.05.bb deleted file mode 100644 index 8c31f29b63..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-locale-perl_1.05.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Encode::Locale - Determine the locale encoding" -HOMEPAGE = "https://metacpan.org/module/Encode::Locale" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://README;md5=14e8006c2134045725fd81292a323d24" - -SRC_URI = "${CPAN_MIRROR}/authors/id/G/GA/GAAS/Encode-Locale-${PV}.tar.gz" -SRC_URI[md5sum] = "fcfdb8e4ee34bcf62aed429b4a23db27" -SRC_URI[sha256sum] = "176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1" - -S = "${WORKDIR}/Encode-Locale-${PV}" - -inherit cpan - -RDEPENDS:${PN} += "libencode-perl \ - libencode-alias-perl \ - perl-module-base \ -" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.20.bb b/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.20.bb deleted file mode 100644 index 6a083420a9..0000000000 --- a/meta-openembedded/meta-perl/recipes-perl/libencode/libencode-perl_3.20.bb +++ /dev/null @@ -1,108 +0,0 @@ -# NOTE: -# You should use perl-module-encode rather than this package -# unless you specifically need a version newer than what is -# provided by perl. - -SUMMARY = "Encode - character encodings" -DESCRIPTION = "The \"Encode\" module provides the interfaces between \ -Perl's strings and the rest of the system. Perl strings are sequences \ -of characters." - -HOMEPAGE = "https://metacpan.org/release/Encode" -SECTION = "lib" -LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://META.json;beginline=8;endline=10;md5=b12e3be1e17a7e99ca4f429ff32c28b5" - -SRC_URI = "${CPAN_MIRROR}/authors/id/D/DA/DANKOGAI/Encode-${PV}.tar.gz" -SRC_URI[sha256sum] = "ced8fc06c54c05f227bfd9db38c1ed48a5a295db89f497d42b335afbf1f73517" - -UPSTREAM_CHECK_REGEX = "Encode\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" - -S = "${WORKDIR}/Encode-${PV}" - -#EXTRA_CPANFLAGS:append = "PERL=../recipe-sysroot-native/usr/bin/perl-native/perl" -inherit cpan ptest-perl -do_install:prepend() { - # Requires "-T" (taint) option on command line - rm -rf ${B}/t/taint.t - # Circular dependency of perl-module-open on perl-module-encode - # and we cannot load perl-module-encode because we are providing - # an alternative - rm -rf ${B}/t/use-Encode-Alias.t -} - -do_install:append() { - sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native||g" ${S}/*/*.exh ${S}/*.exh -} - -do_install_ptest() { - mkdir ${D}${PTEST_PATH}/bin - cp -r ${B}/bin/piconv ${D}${PTEST_PATH}/bin - cp -r ${B}/blib ${D}${PTEST_PATH} - chown -R root:root ${D}${PTEST_PATH} -} - -# file /usr/bin/enc2xs from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -# file /usr/bin/encguess from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -# file /usr/bin/piconv from install of perl-misc-5.24.1-r0.i586 conflicts with file from package libencode-perl-2.94-r0.i586 -RCONFLICTS:${PN} = "perl-misc perl-module-encode" - -RDEPENDS:${PN} += " \ - perl-module-bytes \ - perl-module-constant \ - perl-module-parent \ - perl-module-storable \ - perl-module-xsloader \ - " - -RPROVIDES:${PN} += " \ - libencode-alias-perl \ - libencode-byte-perl \ - libencode-cjkconstants-perl \ - libencode-cn-perl \ - libencode-cn-hz-perl \ - libencode-config-perl \ - libencode-ebcdic-perl \ - libencode-encoder-perl \ - libencode-encoding-perl \ - libencode-gsm0338-perl \ - libencode-guess-perl \ - libencode-jp-perl \ - libencode-jp-h2z-perl \ - libencode-jp-jis7-perl \ - libencode-kr-perl \ - libencode-kr-2022_kr-perl \ - libencode-mime-header-perl \ - libencode-mime-name-perl \ - libencode-symbol-perl \ - libencode-tw-perl \ - libencode-unicode-perl \ - libencode-unicode-utf7-perl \ - libencoding-perl \ - libencode-internal-perl \ - libencode-mime-header-iso_2022_jp-perl \ - libencode-utf8-perl \ - libencode-utf_ebcdic-perl \ - " - -RDEPENDS:${PN}-ptest += " \ - perl-module-blib \ - perl-module-charnames \ - perl-module-file-compare \ - perl-module-file-copy \ - perl-module-filehandle \ - perl-module-findbin \ - perl-module-integer \ - perl-module-io-select \ - perl-module-ipc-open3 \ - perl-module-mime-base64 \ - perl-module-perlio \ - perl-module-perlio-encoding \ - perl-module-perlio-scalar \ - perl-module-test-more \ - perl-module-tie-scalar \ - perl-module-unicore \ - perl-module-utf8 \ - " - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.24.bb b/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.26.bb index a3d9ceef02..fa4ad6fc4c 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.24.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libmime/libmime-types-perl_2.26.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://META.yml;beginline=11;endline=11;md5=963ce28228347875 SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MIME-Types-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "629e361f22b220be50c2da7354e23c0451757709a03c25a22f3160edb94cb65f" +SRC_URI[sha256sum] = "bc738483cb4cdb47d61e85fe9304fa929aa9ab927e3171ec2ba2ab1cd7cefdff" S = "${WORKDIR}/MIME-Types-${PV}" diff --git a/meta-openembedded/meta-python/classes/distutils3-base.bbclass b/meta-openembedded/meta-python/classes/distutils3-base.bbclass index 850c535bb1..4f13ea6fe7 100644 --- a/meta-openembedded/meta-python/classes/distutils3-base.bbclass +++ b/meta-openembedded/meta-python/classes/distutils3-base.bbclass @@ -1,6 +1,6 @@ -DEPENDS:append:class-target = " ${PYTHON_PN}-native ${PYTHON_PN}" -DEPENDS:append:class-nativesdk = " ${PYTHON_PN}-native ${PYTHON_PN}" -RDEPENDS:${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" +DEPENDS:append:class-target = " python3-native python3" +DEPENDS:append:class-nativesdk = " python3-native python3" +RDEPENDS:${PN} += "${@['', 'python3-core']['${CLASSOVERRIDE}' == 'class-target']}" inherit distutils-common-base python3native python3targetconfig diff --git a/meta-openembedded/meta-python/classes/distutils3.bbclass b/meta-openembedded/meta-python/classes/distutils3.bbclass index a6d8e8763f..909415efa0 100644 --- a/meta-openembedded/meta-python/classes/distutils3.bbclass +++ b/meta-openembedded/meta-python/classes/distutils3.bbclass @@ -27,9 +27,9 @@ distutils3_do_compile() { NO_FETCH_BUILD=1 \ STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ + ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ build --build-base=${B} ${DISTUTILS_BUILD_ARGS} || \ - bbfatal_log "'${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS}' execution failed." + bbfatal_log "'python3 setup.py build ${DISTUTILS_BUILD_ARGS}' execution failed." } distutils3_do_compile[vardepsexclude] = "MACHINE" @@ -39,9 +39,9 @@ distutils3_do_install() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ + ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ build --build-base=${B} install --skip-build ${DISTUTILS_INSTALL_ARGS} || \ - bbfatal_log "'${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." + bbfatal_log "'python3 setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." # support filenames with *spaces* find ${D} -name "*.py" -exec grep -q ${D} {} \; \ diff --git a/meta-openembedded/meta-python/classes/python_mesonpy.bbclass b/meta-openembedded/meta-python/classes/python_mesonpy.bbclass deleted file mode 100644 index 131fa74bed..0000000000 --- a/meta-openembedded/meta-python/classes/python_mesonpy.bbclass +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright OpenEmbedded Contributors -# -# SPDX-License-Identifier: MIT -# - -inherit meson setuptools3-base python3targetconfig python_pep517 - -# meson_do_qa_configure does the wrong thing here because -# mesonpy runs "meson setup ..." in do_compile context. -# Make it a dummy function. -meson_do_qa_configure () { - : -} - -# This prevents the meson error: -# ERROR: Got argument buildtype as both -Dbuildtype and --buildtype. Pick one. -MESONOPTS:remove = "--buildtype ${MESON_BUILDTYPE}" - -CONFIGURE_FILES = "pyproject.toml" - -DEPENDS += "python3-wheel-native python3-meson-python-native" - -def mesonpy_get_args(d): - vars = ['MESONOPTS', 'MESON_CROSS_FILE', 'EXTRA_OEMESON'] - varlist = [] - for var in vars: - value = d.getVar(var) - vallist = value.split() - for elem in vallist: - varlist.append("-Csetup-args=" + elem) - return ' '.join(varlist) - -PEP517_BUILD_OPTS = "-Cbuilddir='${B}' ${@mesonpy_get_args(d)}" - -# Python pyx -> c -> so build leaves absolute build paths in the code -INSANE_SKIP:${PN} += "buildpaths" -INSANE_SKIP:${PN}-src += "buildpaths" - -python_mesonpy_do_configure () { - python_pep517_do_configure -} - -python_mesonpy_do_compile () { - python_pep517_do_compile -} - -python_mesonpy_do_install () { - python_pep517_do_install -} - -EXPORT_FUNCTIONS do_configure do_compile do_install 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 5985482628..22894487f1 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 @@ -18,12 +18,19 @@ PTESTS_FAST_META_PYTHON = "\ python3-dominate \ python3-execnet \ python3-geojson \ + python3-gunicorn \ python3-html2text \ python3-inflection \ + python3-inotify \ python3-intervals \ python3-ipy \ python3-iso3166 \ + python3-jdcal \ + python3-jsmin \ + python3-msgpack \ python3-multidict \ + python3-ordered-set \ + python3-parse \ python3-parse-type \ python3-platformdirs \ python3-polyline \ @@ -45,11 +52,14 @@ PTESTS_FAST_META_PYTHON = "\ python3-requests-toolbelt \ python3-semver \ python3-serpent \ + python3-service-identity \ python3-simpleeval \ python3-smpplib \ python3-soupsieve \ python3-sqlparse \ python3-tomlkit \ + python3-trustme \ + python3-typeguard \ python3-ujson \ python3-u-msgpack-python \ python3-unidiff \ @@ -69,22 +79,10 @@ PTESTS_PROBLEMS_META_PYTHON ="\ python3-dnspython \ python3-fastjsonschema \ python3-gpiod \ - python3-gunicorn \ - python3-inotify \ - python3-jdcal \ - python3-jsmin \ - python3-license-expression \ - python3-msgpack \ - python3-ordered-set \ - python3-parse \ python3-pillow \ python3-pint \ - python3-pytest-lazy-fixture \ python3-pyzmq \ python3-scrypt \ - python3-service-identity \ - python3-trustme \ - python3-typeguard \ python3-whoosh \ python3-xlrd \ " diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_4.1.0.bb b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_4.1.0.bb index c2d58846df..6b3ce25371 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_4.1.0.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-h2/python3-h2_4.1.0.bb @@ -8,4 +8,4 @@ SRC_URI[sha256sum] = "a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c2 inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-hpack ${PYTHON_PN}-hyperframe" +RDEPENDS:${PN} += "python3-hpack python3-hyperframe" diff --git a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.82.bb b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.82.bb index a7ed75f018..c49e67c919 100644 --- a/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.82.bb +++ b/meta-openembedded/meta-python/recipes-connectivity/python-pyro4/python3-pyro4_4.82.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "Pyro4" inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-serpent \ - ${PYTHON_PN}-threading \ + python3-logging \ + python3-serpent \ + python3-threading \ " diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb index 56c392f036..d6708c5fd0 100644 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest-all.bb @@ -9,7 +9,7 @@ REQUIRED_DISTRO_FEATURES = "ptest" require conf/include/ptest-packagelists-meta-python.inc # Include the full set of ptests -PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON}" +PTESTS_META_PYTHON = "${PTESTS_FAST_META_PYTHON} ${PTESTS_SLOW_META_PYTHON} ${PTESTS_PROBLEMS_META_PYTHON}" do_testimage[noexec] = "1" do_testimage[depends] = "${@' '.join(['meta-python-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS_META_PYTHON').split()])}" diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb index fed676c42e..9c542855a2 100644 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb @@ -9,7 +9,7 @@ SUMMARY = "meta-python ptest test image" DESCRIPTION += "Also including the ${MCNAME} ptest package." HOMEPAGE = "https://www.openembedded.org/" -PTESTS_META_PYTHON = "${PTESTS_SLOW_META_PYTHON} ${PTESTS_FAST_META_PYTHON}" +PTESTS_META_PYTHON = "${PTESTS_SLOW_META_PYTHON} ${PTESTS_FAST_META_PYTHON} ${PTESTS_PROBLEMS_META_PYTHON}" IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" diff --git a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb index 41fce53274..eb5a264631 100644 --- a/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb +++ b/meta-openembedded/meta-python/recipes-core/packagegroups/packagegroup-meta-python.bb @@ -348,7 +348,7 @@ RDEPENDS:packagegroup-meta-python3 = "\ python3-pytest-forked \ python3-pytest-helpers-namespace \ python3-pytest-html \ - python3-pytest-lazy-fixture \ + python3-pytest-lazy-fixtures \ python3-pytest-metadata \ python3-pytest-tempdir \ python3-pytest-timeout \ @@ -507,7 +507,6 @@ RDEPENDS:packagegroup-meta-python3-ptest = "\ python3-pyasn1-modules-ptest \ python3-pyroute2-ptest \ python3-pyserial-ptest \ - python3-pytest-lazy-fixture-ptest \ python3-pytoml-ptest \ python3-pyzmq-ptest \ python3-requests-file-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python-jsonref/python3-jsonref_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python-jsonref/python3-jsonref_1.1.0.bb index fae1da2686..4272fc4f24 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python-jsonref/python3-jsonref_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python-jsonref/python3-jsonref_1.1.0.bb @@ -12,12 +12,12 @@ inherit pypi python_setuptools_build_meta BBCLASSEXTEND = "native nativesdk" DEPENDS += " \ - ${PYTHON_PN}-pdm-native \ - ${PYTHON_PN}-pdm-backend-native \ + python3-pdm-native \ + python3-pdm-backend-native \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-netclient \ + python3-core \ + python3-json \ + python3-netclient \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb index 9407586466..ed4e588509 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/pyrtm_0.4.2.bb @@ -20,9 +20,9 @@ FILES:${PN}-tests += " \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ + python3-json \ + python3-logging \ + python3-netclient \ " RDEPENDS:${PN}-samples += " \ @@ -31,5 +31,5 @@ RDEPENDS:${PN}-samples += " \ RDEPENDS:${PN}-tests += " \ ${PN} \ - ${PYTHON_PN}-unittest \ + python3-unittest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-django-south.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-django-south.inc index 4a376391aa..28eb84c563 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-django-south.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-django-south.inc @@ -13,5 +13,5 @@ inherit pypi BBCLASSEXTEND = "native nativesdk" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-django \ + python3-django \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc index 11d5e63018..d9ab3fd21f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-django.inc @@ -13,21 +13,21 @@ FILES:${PN} += "${datadir}/django" BBCLASSEXTEND = "native nativesdk" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-xml \ + python3-compression \ + python3-ctypes \ + python3-datetime \ + python3-email \ + python3-html \ + python3-json \ + python3-logging \ + python3-multiprocessing \ + python3-netserver \ + python3-numbers \ + python3-pkgutil \ + python3-pytz \ + python3-threading \ + python3-unixadmin \ + python3-xml \ " CVE_PRODUCT = "django" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc index 1a729c975b..24c76ce942 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-bootstrap.inc @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "cb08ed940183f6343a64e465e83b3a3f13c53e1baabb8d72b5da4545ef PYPI_PACKAGE = "Flask-Bootstrap" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-dominate \ - ${PYTHON_PN}-flask \ - ${PYTHON_PN}-visitor \ + python3-dominate \ + python3-flask \ + python3-visitor \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc index 5f4e0858f8..8434d2610b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-flask-xstatic.inc @@ -11,6 +11,6 @@ SRC_URI += "file://remove-pip-requires.patch" PYPI_PACKAGE = "Flask-XStatic" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-flask \ - ${PYTHON_PN}-xstatic \ + python3-flask \ + python3-xstatic \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.15.bb index f9fdb6aeb6..3769be0d5d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.15.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aenum_3.1.15.bb @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "8cbd76cd18c4f870ff39b24284d3ea028fbe8731a58df3aa581e434c57 inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-pprint \ + python3-pprint \ " BBCLASSEXTEND = "native nativesdk" 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 02a0b4ea2c..ec7d62ee2c 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 @@ -11,8 +11,8 @@ PYPI_PACKAGE = "aiodns" inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-pycares \ + python3-asyncio \ + python3-pycares \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_23.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_23.2.1.bb index 7992b00f3e..73dc17423e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_23.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_23.2.1.bb @@ -11,5 +11,5 @@ PYPI_PACKAGE = "aiofiles" inherit pypi python_hatchling RDEPENDS:${PN} = "\ - ${PYTHON_PN}-asyncio \ + python3-asyncio \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.6.bb index 694f577b06..df4a0adcaf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp-jinja2_1.6.bb @@ -8,6 +8,6 @@ SRC_URI[sha256sum] = "a3a7ff5264e5bca52e8ae547bbfd0761b72495230d438d05b6c0915be6 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-jinja2 \ - ${PYTHON_PN}-aiohttp \ + python3-jinja2 \ + python3-aiohttp \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.3.bb index 99fb84cd51..2cdd352e59 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.3.bb @@ -10,11 +10,11 @@ PYPI_PACKAGE = "aiohttp" inherit python_setuptools_build_meta pypi RDEPENDS:${PN} = "\ - ${PYTHON_PN}-aiohappyeyeballs \ - ${PYTHON_PN}-aiosignal \ - ${PYTHON_PN}-async-timeout \ - ${PYTHON_PN}-frozenlist \ - ${PYTHON_PN}-multidict \ - ${PYTHON_PN}-yarl \ - ${PYTHON_PN}-aiodns \ + python3-aiohappyeyeballs \ + python3-aiosignal \ + python3-async-timeout \ + python3-frozenlist \ + python3-multidict \ + python3-yarl \ + python3-aiodns \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.7.1.bb index 84aace451d..438c771dbc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.7.1.bb @@ -4,13 +4,13 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" -SRC_URI[sha256sum] = "3ca727b463e55bbe7c69b67f5503ffcd7d213c9644c4e458e3556ee6ea33855b" +SRC_URI[sha256sum] = "29b5e5ae05938cac195b1969e70bd6ad4e4e2e105d0e565849803d2a99ff47d1" inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ - ${PYTHON_PN}-aiohttp \ - ${PYTHON_PN}-asyncio-throttle \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-awesomeversion \ + python3-aiohttp \ + python3-asyncio-throttle \ + python3-profile \ + python3-awesomeversion \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb index 1463287d0a..fd4ec767c0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb @@ -10,5 +10,5 @@ inherit pypi setuptools3 BBCLASSEXTEND = "native nativesdk" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-frozenlist \ + python3-frozenlist \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.13.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.13.1.bb index 2a9ac2c5d2..c4853c4437 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.13.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.13.1.bb @@ -9,11 +9,11 @@ SRC_URI[sha256sum] = "4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc PYPI_PACKAGE = "alembic" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-editor \ - ${PYTHON_PN}-mako \ - ${PYTHON_PN}-sqlalchemy \ - ${PYTHON_PN}-misc \ + python3-dateutil \ + python3-editor \ + python3-mako \ + python3-sqlalchemy \ + python3-misc \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb index e419fdcf18..6af8989177 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb @@ -10,10 +10,10 @@ SRC_URI[sha256sum] = "5c6837a13ecc1903aab7a545353312049dfedfe5105362ad3a8d9d2078 inherit pypi python_setuptools_build_meta DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ + python3-setuptools-scm-native \ " RDEPENDS:${PN} = " \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-compression \ + python3-six \ + python3-compression \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.2.2.bb index fffecf521d..90560fabe7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.2.2.bb @@ -10,8 +10,8 @@ PYPI_PACKAGE = "argcomplete" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-io \ + python3-core \ + python3-io \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_2.0.2.bb index 1a48a88c29..3130e2cb96 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_2.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-arpeggio_2.0.2.bb @@ -10,8 +10,8 @@ inherit pypi setuptools3 # setup.py of Arpeggio needs this. DEPENDS += "\ - ${PYTHON_PN}-pytest-runner-native \ - ${PYTHON_PN}-wheel-native \ + python3-pytest-runner-native \ + python3-wheel-native \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-arrow_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-arrow_1.3.0.bb index ec49d04eb9..90ba5de96f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-arrow_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-arrow_1.3.0.bb @@ -9,5 +9,5 @@ SRC_URI[sha256sum] = "d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4 inherit setuptools3 pypi RDEPENDS:${PN} += " \ - ${PYTHON_PN}-dateutil \ + python3-dateutil \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.3.bb index 1b8787215d..b02b15113b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.0.3.bb @@ -9,8 +9,8 @@ SRC_URI[sha256sum] = "4148645659b08b70d72460ed1921158027a9e53ae8b7234149b1400edd inherit pypi python_setuptools_build_meta DEPENDS += "\ - ${PYTHON_PN}-pytest-runner-native \ - ${PYTHON_PN}-wheel-native \ + python3-pytest-runner-native \ + python3-wheel-native \ " PACKAGES =+ "${PN}-tests" @@ -21,17 +21,17 @@ FILES:${PN}-tests += " \ " RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-lazy-object-proxy \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-wrapt \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-typing-extensions \ + python3-lazy-object-proxy \ + python3-logging \ + python3-six \ + python3-wrapt \ + python3-setuptools \ + python3-typing-extensions \ " RDEPENDS:${PN}-tests:class-target += "\ - ${PYTHON_PN}-unittest \ - ${PYTHON_PN}-xml \ + python3-unittest \ + python3-xml \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.4.1.bb index 5cc4291f78..dbb2fc0ebe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-asttokens_2.4.1.bb @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "b03869718ba9a6eb027e134bfdf69f38a236d681c83c160d510768af11 DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-six \ + python3-six \ " BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.3.bb index c16dfd0bf8..3d35780b65 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-async-timeout_4.0.3.bb @@ -14,5 +14,5 @@ PYPI_PACKAGE = "async-timeout" inherit pypi python_setuptools_build_meta RDEPENDS:${PN} = "\ - ${PYTHON_PN}-asyncio \ + python3-asyncio \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb index 42a8e0e7b5..d9cc40b1b4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb @@ -8,14 +8,14 @@ SRC_URI[sha256sum] = "ec9421c52a2103364d1ef0468036e6019ee84f71721e86b36fe19ad696 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-twisted \ - ${PYTHON_PN}-zopeinterface \ - ${PYTHON_PN}-py-ubjson \ - ${PYTHON_PN}-cbor2 \ - ${PYTHON_PN}-u-msgpack-python \ - ${PYTHON_PN}-lz4 \ - ${PYTHON_PN}-snappy \ - ${PYTHON_PN}-pyopenssl \ - ${PYTHON_PN}-txaio \ - ${PYTHON_PN}-six \ + python3-twisted \ + python3-zopeinterface \ + python3-py-ubjson \ + python3-cbor2 \ + python3-u-msgpack-python \ + python3-lz4 \ + python3-snappy \ + python3-pyopenssl \ + python3-txaio \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_22.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_22.10.0.bb index bb29fbd4a6..9e33fe7831 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_22.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_22.10.0.bb @@ -5,12 +5,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" SRC_URI[sha256sum] = "e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" PYPI_PACKAGE = "Automat" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-six \ + python3-attrs \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_23.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_24.2.0.bb index 67b78c9e9f..8b19605b1e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_23.11.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_24.2.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" -SRC_URI[sha256sum] = "9146329196f0f045887de6c195730750f8f7a9302d1c149378db73ab5dc468f0" +SRC_URI[sha256sum] = "47a6dcbbe2921b725f75106a66ab30f26f1f33dbc5e07bc8e1e39d8eb921f53c" RDEPENDS:${PN} += "python3-profile python3-logging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.2.bb index 35d061f5e6..bdadf7c774 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aws-iot-device-sdk-python_1.5.2.bb @@ -27,15 +27,15 @@ do_install:append() { PACKAGES =+ "${PN}-examples" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ + python3-crypt \ + python3-datetime \ + python3-io \ + python3-json \ + python3-logging \ + python3-math \ + python3-netclient \ + python3-numbers \ + python3-threading \ " RDEPENDS:${PN}-examples += "${PN}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.3.bb index 6283098773..14dedba922 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-beautifulsoup4_4.12.3.bb @@ -8,11 +8,11 @@ SRC_URI[sha256sum] = "74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7 inherit pypi python_hatchling RDEPENDS:${PN} = "\ - ${PYTHON_PN}-html5lib \ - ${PYTHON_PN}-lxml \ - ${PYTHON_PN}-soupsieve \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-logging \ + python3-html5lib \ + python3-lxml \ + python3-soupsieve \ + python3-html \ + python3-logging \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb index 1dcc7d218e..da4f3047f9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-behave_1.2.6.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/git" inherit setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-parse-type \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ + python3-parse-type \ + python3-setuptools \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.22.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.23.0.bb index 1ed0af81a1..5667e4927f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.22.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bidict_0.23.0.bb @@ -2,9 +2,9 @@ SUMMARY = "The bidirectional mapping library for Python." DESCRIPTION = "The bidirectional mapping library for Python." HOMEPAGE = "https://bidict.readthedocs.io/" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=858e74278ef3830d46481172ae03c819" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e907308cc9356afa99ac0eec6b20211b" -SRC_URI[sha256sum] = "1e0f7f74e4860e6d0943a05d4134c63a2fad86f3d4732fb265bd79e4e856d81d" +SRC_URI[sha256sum] = "3959ca59d4d6997702d642bf1e5fd93cba299863723fc289545198f70c468578" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstring_4.1.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstring_4.1.4.bb index 6fc2cf4809..0777b6cffb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstring_4.1.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstring_4.1.4.bb @@ -10,10 +10,10 @@ PYPI_PACKAGE = "bitstring" inherit pypi python_poetry_core RDEPENDS:${PN} = "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-mmap \ - ${PYTHON_PN}-numbers \ + python3-core \ + python3-io \ + python3-mmap \ + python3-numbers \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb index 0f639f33e7..678f12b730 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362 inherit pypi setuptools3 RDEPENDS:${PN} = "\ - ${PYTHON_PN}-cffi \ + python3-cffi \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.4.bb index 3cf9560837..ebae6b63e6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cantools_39.4.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/eerimoq/cantools" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" -SRC_URI[sha256sum] = "7aaa3d246bc5328bb29c681fc8162d2800be05ee095b3edb9470fa1478f9e506" +SRC_URI[sha256sum] = "6e8e918b6671a62a9f3990546ece5623e1deb71defb1cef85a9955ac301da99e" PYPI_PACKAGE = "cantools" @@ -12,13 +12,13 @@ inherit pypi python_poetry_core DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-can \ - ${PYTHON_PN}-bitstruct \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-textparser \ - ${PYTHON_PN}-typing-extensions \ - ${PYTHON_PN}-diskcache \ - ${PYTHON_PN}-asyncio \ + python3-can \ + python3-bitstruct \ + python3-core \ + python3-textparser \ + python3-typing-extensions \ + python3-diskcache \ + python3-asyncio \ " CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.29.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.29.0.bb index 8ec87fa26a..b8565d17e8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.29.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cassandra-driver_3.29.0.bb @@ -13,16 +13,16 @@ SRC_URI[sha256sum] = "0a34f9534356e5fd33af8cdda109d5e945b6335cb50399b267c46368c4 inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-cython \ - ${PYTHON_PN}-geomet \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-six \ + python3-cython \ + python3-geomet \ + python3-json \ + python3-misc \ + python3-multiprocessing \ + python3-numbers \ + python3-six \ libevent \ " DEPENDS += "\ - ${PYTHON_PN}-cython \ + python3-cython \ " 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 index 408dff87bf..64948d2e9d 100644 --- 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 @@ -9,5 +9,5 @@ SRC_URI[sha256sum] = "f25b3c634efe702896233690f7590e8d6311590910f18dbb763b90419d inherit pypi setuptools3 RDEPENDS:${PN} = "\ - ${PYTHON_PN}-requests \ + python3-requests \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_3.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_3.3.2.bb index 666cb5dc3a..0e6d62fc2b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_3.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-charset-normalizer_3.3.2.bb @@ -8,8 +8,8 @@ SRC_URI[sha256sum] = "f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-json \ + python3-core \ + python3-logging \ + python3-codecs \ + python3-json \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb index 33e42cb3b8..b773ed6b8b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb @@ -7,4 +7,4 @@ SRC_URI[sha256sum] = "17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69c inherit pypi setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-click ${PYTHON_PN}-prompt-toolkit" +RDEPENDS:${PN} = "python3-click python3-prompt-toolkit" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmake_3.28.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb index a6a7b6c4fc..6b31d0b4f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmake_3.28.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmake_3.28.3.bb @@ -11,7 +11,7 @@ PYPI_PACKAGE = "cmake" PYPI_ARCHIVE_NAME_PREFIX = "pypi-" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "0d4051d101d151d8387156c463aa45c8cd0e164f870e0ac0c8c91d3ff08528e1" +SRC_URI[sha256sum] = "a8092815c739da7d6775c26ec30c2645f0fca9527a29e36a682faec7d39cde89" SRC_URI += " \ file://CMakeLists.txt \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.3.bb index 29d790b94f..3d37e8b3c7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cmd2_2.4.3.bb @@ -3,21 +3,21 @@ HOMEPAGE = "https://github.com/python-cmd2/cmd2" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=fad7740aa21780c8b9a214f5b320b4ad" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" SRC_URI[sha256sum] = "71873c11f72bd19e2b1db578214716f0d4f7c8fa250093c601265a9a717dee52" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-pyperclip \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-pydoc \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-numbers \ + python3-attrs \ + python3-colorama \ + python3-pyperclip \ + python3-wcwidth \ + python3-compression \ + python3-pydoc \ + python3-json \ + python3-numbers \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb index 52e1e68b1b..0f364c424d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb @@ -8,7 +8,7 @@ inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44" DEPENDS += " \ - ${PYTHON_PN}-hatchling-native \ + python3-hatchling-native \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorclass_2.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorclass_2.2.2.bb index 00c2c4e92b..ff72f4c2f6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorclass_2.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorclass_2.2.2.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "6d4fe287766166a98ca7bc6f6312daf04a0481b1eda43e7173484051c0 PYPI_PACKAGE="colorclass" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-ctypes \ + python3-ctypes \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.1.bb index d17ab87525..31f75eef62 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coloredlogs_15.0.1.bb @@ -13,7 +13,7 @@ do_install:append() { } RDEPENDS:${PN} += "\ - ${PYTHON_PN}-humanfriendly \ + python3-humanfriendly \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.7.bb index 2eab701c8a..1c49d891d2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-configargparse_1.7.bb @@ -10,12 +10,12 @@ PYPI_PACKAGE = "ConfigArgParse" inherit pypi setuptools3 PACKAGECONFIG ?= "yaml" -PACKAGECONFIG[yaml] = ",,,${PYTHON_PN}-pyyaml" +PACKAGECONFIG[yaml] = ",,,python3-pyyaml" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-json \ + python3-core \ + python3-shell \ + python3-json \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-constantly_23.10.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-constantly_23.10.4.bb index cb6ca0a82d..2df501aaa6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-constantly_23.10.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-constantly_23.10.4.bb @@ -7,6 +7,6 @@ SRC_URI[sha256sum] = "aa92b70a33e2ac0bb33cd745eb61776594dc48764b06c35e0efd050b7f inherit pypi python_poetry_core -DEPENDS += "${PYTHON_PN}-versioneer-native" +DEPENDS += "python3-versioneer-native" -RDEPENDS:${PN} += "${PYTHON_PN}-json" +RDEPENDS:${PN} += "python3-json" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-crcmod_1.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-crcmod_1.7.bb index f8f1683601..11d36b53ec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-crcmod_1.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-crcmod_1.7.bb @@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f2 inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-unittest" +RDEPENDS:${PN} += "python3-unittest" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cytoolz_0.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cytoolz_0.12.3.bb index 6c35ad5807..f9c9704d7f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cytoolz_0.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cytoolz_0.12.3.bb @@ -9,5 +9,5 @@ SRC_URI[sha256sum] = "4503dc59f4ced53a54643272c61dc305d1dbbfbd7d6bdf296948de9f34 inherit pypi setuptools3 -DEPENDS += "${PYTHON_PN}-cython-native" -RDEPENDS:${PN} += "${PYTHON_PN}-toolz" +DEPENDS += "python3-cython-native" +RDEPENDS:${PN} += "python3-toolz" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb index 79507bdce2..715d3bf120 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb @@ -2,10 +2,10 @@ DESCRIPTION = "Library to implement a well-behaved Unix daemon process" HOMEPAGE = "https://pagure.io/python-daemon/" SECTION = "devel/python" -DEPENDS += "${PYTHON_PN}-docutils-native" -RDEPENDS:${PN} = "${PYTHON_PN}-docutils \ - ${PYTHON_PN}-lockfile (>= 0.10) \ - ${PYTHON_PN}-resource \ +DEPENDS += "python3-docutils-native" +RDEPENDS:${PN} = "python3-docutils \ + python3-lockfile (>= 0.10) \ + python3-resource \ " LICENSE = "Apache-2.0 & GPL-3.0-only" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.2.bb index e281f0f285..c8e8a45c98 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dateutil_2.8.2.bb @@ -13,13 +13,13 @@ inherit pypi python_setuptools_build_meta PACKAGES =+ "${PN}-zoneinfo" FILES:${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-stringold \ + python3-datetime \ + python3-numbers \ + python3-six \ + python3-stringold \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.1.1.bb index c9c6f9a62e..6d5cafb1d5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-decorator_5.1.1.bb @@ -14,5 +14,5 @@ SRC_URI[sha256sum] = "637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253a inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-stringold \ + python3-stringold \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.14.bb index 4b5c78fb03..49d5f01c8f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.14.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-deprecated_1.2.14.bb @@ -9,5 +9,5 @@ SRC_URI[sha256sum] = "e5323eb936458dccc2582dc6f9c322c852a775a27065ff2b0c4970b9d5 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-wrapt \ + python3-wrapt \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb index 4ea5aa04a4..04e7f4bfb8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb @@ -10,10 +10,10 @@ inherit pypi setuptools3 PYPI_PACKAGE_EXT = "tar.gz" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-core \ + python3-multiprocessing \ + python3-logging \ + python3-profile \ + python3-core \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.6.3.bb index 8bc498dc4e..09b06553df 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-diskcache_5.6.3.bb @@ -10,13 +10,13 @@ PYPI_PACKAGE = "diskcache" inherit pypi setuptools3 RDEPENDS:${PN} = "\ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-sqlite3 \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-threading \ + python3-json \ + python3-pickle \ + python3-sqlite3 \ + python3-core \ + python3-io \ + python3-compression \ + python3-threading \ " CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.9.0.bb index a342432a6b..08a9526783 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.9.0.bb @@ -10,10 +10,10 @@ SRC_URI[sha256sum] = "2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd inherit pypi python_setuptools_build_meta RDEPENDS:${PN} = "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-shell \ + python3-core \ + python3-json \ + python3-logging \ + python3-shell \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.10.bb index 45de692356..c78c8aab5e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.10.bb @@ -4,8 +4,8 @@ inherit setuptools3 SRC_URI[sha256sum] = "b1260ed381b10a11753c73444408e19869f3241fc45c985cd55a30177c789d13" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-sqlparse \ - ${PYTHON_PN}-asgiref \ + python3-sqlparse \ + python3-asgiref \ " # Set DEFAULT_PREFERENCE so that the LTS version of django is built by diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.1.bb deleted file mode 100644 index eed1e6edc6..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.1.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-django.inc -inherit setuptools3 - -SRC_URI[sha256sum] = "8c8659665bc6e3a44fefe1ab0a291e5a3fb3979f9a8230be29de975e57e8f854" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-sqlparse \ - ${PYTHON_PN}-asgiref \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.2.bb new file mode 100644 index 0000000000..3f61dabe07 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.2.bb @@ -0,0 +1,9 @@ +require python-django.inc +inherit setuptools3 + +SRC_URI[sha256sum] = "b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080" + +RDEPENDS:${PN} += "\ + python3-sqlparse \ + python3-asgiref \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.14.0.bb index fee8a3a029..c39f37f7e6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.14.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.14.0.bb @@ -12,5 +12,5 @@ PYPI_PACKAGE = "djangorestframework" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-django \ + python3-django \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.6.0.bb index c5c8d42e2d..c014371834 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dnspython_2.6.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.dnspython.org/" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=5af50906b5929837f667dfe31052bd34" -SRC_URI[sha256sum] = "a0034815a59ba9ae888946be7ccca8f7c157b286f8455b379c692efb51022a15" +SRC_URI[sha256sum] = "233f871ff384d84c33b2eaf4358ffe7f8927eae3b257ad8467f9bdba7e7ac6bc" inherit pypi python_hatchling ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.3.0.bb index fe0e99a20e..3e7f70f04f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.3.0.bb @@ -3,17 +3,17 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[sha256sum] = "c53f6531e602dd596a729f75833146ada40c2445a10dae36d9e461068b63af29" +SRC_URI[sha256sum] = "8d25db9150f5a6aa978c9f58e607fcd5ab6e6e3017140563439a9884ab1eb304" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-stringold \ + python3-xml \ + python3-core \ + python3-numbers \ + python3-datetime \ + python3-stringold \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.9.0.bb index 9dad138ea2..790d1b44cf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.8.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-engineio_4.9.0.bb @@ -17,4 +17,4 @@ RDEPENDS:${PN} += " \ python3-asyncio \ " -SRC_URI[sha256sum] = "f8609e3afdda318fdc336b4ba2de8dd397bb8f9b8a1b43e56c27330e32c2e34c" +SRC_URI[sha256sum] = "e87459c15638e567711fd156e6f9c4a402668871bed79523f0ecfec744729ec7" 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 index 84c270df64..ce48d9dcf9 100644 --- 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 @@ -9,12 +9,12 @@ SRC_URI[sha256sum] = "2ffc7a0c7538053a06a7d11495c16c7ad9897dd42be0f64ca7551e9f6e 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 \ + python3-bitarray \ + python3-eth-abi \ + python3-eth-keyfile \ + python3-eth-keys \ + python3-eth-rlp \ + python3-eth-utils \ + python3-hexbytes \ + python3-rlp \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.6.0.bb index 77e6565272..8464dbe403 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.6.0.bb @@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "ae72889e60db6acbb3872c288cfa02ed157f4c27630fcd7f9c8442302c inherit pypi setuptools3 RDEPENDS:${PN} = "\ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-pycryptodome \ + python3-logging \ + python3-pycryptodome \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-rlp_1.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-rlp_1.0.1.bb index 243f75f5b6..7ee20b9b2b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-rlp_1.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-rlp_1.0.1.bb @@ -9,8 +9,8 @@ SRC_URI[sha256sum] = "d61dbda892ee1220f28fb3663c08f6383c305db9f1f5624dc585c9cd05 inherit pypi setuptools3 RDEPENDS:${PN} = " \ - ${PYTHON_PN}-eth-utils \ - ${PYTHON_PN}-hexbytes \ - ${PYTHON_PN}-rlp \ - ${PYTHON_PN}-typing-extensions \ + python3-eth-utils \ + python3-hexbytes \ + python3-rlp \ + python3-typing-extensions \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.6.1.bb index c091040c5d..be6f9611e7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.6.1.bb @@ -14,9 +14,9 @@ do_compile:prepend() { SETUPTOOLS_BUILD_ARGS = "build_ecodes --evdev-headers ${STAGING_DIR_TARGET}/usr/include/linux/input.h:${STAGING_DIR_TARGET}/usr/include/linux/input-event-codes.h" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ + python3-ctypes \ + python3-fcntl \ + python3-io \ + python3-shell \ + python3-stringold \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.35.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.35.1.bb index c1d10eca3f..eb7f76b096 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.35.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.35.1.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "3b2eede94d64538cb894eec50302a881e056ed7e057f0e24fb45b28a19 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-dnspython \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-greenlet \ + python3-dnspython \ + python3-six \ + python3-greenlet \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.19.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.19.bb index a4fece023b..22e58c5668 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.19.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fasteners_0.19.bb @@ -8,6 +8,6 @@ SRC_URI[sha256sum] = "b4f37c3ac52d8a445af3a66bce57b33b5e90b97c696b7b984f530cf8f0 inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "\ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-fcntl \ + python3-logging \ + python3-fcntl \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb index 837edf7df7..5289ad3745 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb @@ -13,9 +13,9 @@ inherit pypi setuptools3 RDEPENDS:${PN} += " \ file \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-threading \ + python3-core \ + python3-ctypes \ + python3-threading \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-filelock_3.13.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-filelock_3.13.1.bb index 444c484412..ab0b114e43 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-filelock_3.13.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-filelock_3.13.1.bb @@ -12,5 +12,5 @@ BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling DEPENDS += "\ - ${PYTHON_PN}-hatch-vcs-native \ + python3-hatch-vcs-native \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_4.0.0.bb index 4d8aee532c..b445ec0e1c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_4.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-babel_4.0.0.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "flask_babel" inherit pypi python_poetry_core RDEPENDS:${PN} += "\ - ${PYTHON_PN}-speaklater \ - ${PYTHON_PN}-babel \ - ${PYTHON_PN}-flask \ + python3-speaklater \ + python3-babel \ + python3-flask \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jsonpify_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jsonpify_1.5.0.bb index 68eb2cefe7..76c6fb7731 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jsonpify_1.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jsonpify_1.5.0.bb @@ -11,4 +11,4 @@ SRC_URI[sha256sum] = "8ac4c732aa5b11d9f6c2de58065d3b669f139518ca8f529bce943817e2 inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-flask" +RDEPENDS:${PN} += "python3-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jwt_0.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jwt_0.3.2.bb index f2eb34d0f7..35bcbc00ae 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jwt_0.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-jwt_0.3.2.bb @@ -11,4 +11,4 @@ SRC_URI[sha256sum] = "49c0672fbde0f1cd3374bd834918d28956e3c521c7e00089cdc5380d32 inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-pyjwt ${PYTHON_PN}-flask" +RDEPENDS:${PN} += "python3-pyjwt python3-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.6.3.bb index 458ba46b2b..d990d4e80b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-login_0.6.3.bb @@ -12,4 +12,4 @@ PYPI_PACKAGE = "Flask-Login" inherit pypi setuptools3 -RDEPENDS:${PN}:class-target = "${PYTHON_PN}-flask" +RDEPENDS:${PN}:class-target = "python3-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.5.bb index 13f4e0f5a7..87553c17e3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-migrate_4.0.5.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "Flask-Migrate" inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "\ - ${PYTHON_PN}-flask-sqlalchemy \ - ${PYTHON_PN}-alembic \ - ${PYTHON_PN}-flask \ + python3-flask-sqlalchemy \ + python3-alembic \ + python3-flask \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb index d7edba25c1..3855909fbc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-nav_0.6.bb @@ -10,6 +10,6 @@ PYPI_PACKAGE = "flask-nav" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-blinker \ - ${PYTHON_PN}-flask \ + python3-blinker \ + python3-flask \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb index a995a2ea39..1cd4a4b699 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-pymongo_2.3.0.bb @@ -12,6 +12,6 @@ PYPI_PACKAGE = "Flask-PyMongo" inherit pypi setuptools3 -DEPENDS = "${PYTHON_PN}-vcversioner ${PYTHON_PN}-vcversioner-native" +DEPENDS = "python3-vcversioner python3-vcversioner-native" -RDEPENDS:${PN} = "${PYTHON_PN}-pymongo ${PYTHON_PN}-flask" +RDEPENDS:${PN} = "python3-pymongo python3-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.10.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.10.bb index 7d5f1ea41d..8ea455c633 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.10.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-restful_0.3.10.bb @@ -12,4 +12,4 @@ inherit pypi setuptools3 PYPI_PACKAGE = "Flask-RESTful" -RDEPENDS:${PN} = "${PYTHON_PN}-flask" +RDEPENDS:${PN} = "python3-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.6.bb index e151fda9d5..6b76e03f8d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-socketio_5.3.6.bb @@ -12,6 +12,6 @@ PYPI_PACKAGE = "Flask-SocketIO" SRC_URI[sha256sum] = "bb8f9f9123ef47632f5ce57a33514b0c0023ec3696b2384457f0fcaa5b70501c" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-flask \ - ${PYTHON_PN}-socketio \ + python3-flask \ + python3-socketio \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb index 56f63bf036..f5fe1cc446 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-sqlalchemy_3.1.1.bb @@ -10,4 +10,4 @@ UPSTREAM_CHECK_REGEX = "/Flask-SQLAlchemy/(?P<pver>(\d+[\.\-_]*)+)" inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} = "${PYTHON_PN}-sqlalchemy ${PYTHON_PN}-flask" +RDEPENDS:${PN} = "python3-sqlalchemy python3-flask" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb index 388e257a8b..9ac321dec7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-uploads_0.2.1.bb @@ -10,5 +10,5 @@ PYPI_PACKAGE = "Flask-Uploads" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-flask \ + python3-flask \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb index 973bb570b8..509be463f8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-wtf_1.2.1.bb @@ -11,8 +11,8 @@ UPSTREAM_CHECK_REGEX = "/Flask-WTF/(?P<pver>(\d+[\.\-_]*)+)" inherit pypi python_hatchling RDEPENDS:${PN} = "\ - ${PYTHON_PN}-flask \ - ${PYTHON_PN}-itsdangerous \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-wtforms \ + python3-flask \ + python3-itsdangerous \ + python3-json \ + python3-wtforms \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb index 7692eb116b..300ca99ddc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.2.bb @@ -16,10 +16,10 @@ inherit pypi python_setuptools_build_meta CLEANBROKEN = "1" RDEPENDS:${PN} = " \ - ${PYTHON_PN}-blinker \ - ${PYTHON_PN}-click \ - ${PYTHON_PN}-itsdangerous \ - ${PYTHON_PN}-jinja2 \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-werkzeug \ + python3-blinker \ + python3-click \ + python3-itsdangerous \ + python3-jinja2 \ + python3-profile \ + python3-werkzeug \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-frozenlist_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-frozenlist_1.4.1.bb index 1ce5c84527..4288f2922e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-frozenlist_1.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-frozenlist_1.4.1.bb @@ -8,8 +8,8 @@ SRC_URI[sha256sum] = "c037a86e8513059a2613aaba4d817bb90b9d9b6b69aace3ce9c877e8c8 inherit pypi python_setuptools_build_meta DEPENDS += " \ - ${PYTHON_PN}-expandvars-native \ - ${PYTHON_PN}-cython-native \ + python3-expandvars-native \ + python3-cython-native \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_7.0.bb index 6e5899ae23..1a81a38b0f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gcovr_7.0.bb @@ -12,6 +12,6 @@ S = "${WORKDIR}/git" inherit setuptools3 PIP_INSTALL_PACKAGE = "gcovr" -RDEPENDS:${PN} += "${PYTHON_PN}-jinja2 ${PYTHON_PN}-lxml ${PYTHON_PN}-setuptools ${PYTHON_PN}-pygments ${PYTHON_PN}-multiprocessing" +RDEPENDS:${PN} += "python3-jinja2 python3-lxml python3-setuptools python3-pygments python3-multiprocessing" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb index 72b2bbcb76..bdf4fc5386 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb @@ -16,10 +16,10 @@ inherit setuptools3 PIP_INSTALL_PACKAGE = "geomet" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-click \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ + python3-click \ + python3-core \ + python3-io \ + python3-json \ + python3-logging \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent/0001-_setuputils.py-Do-not-add-sys_inc_dir.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent/0001-_setuputils.py-Do-not-add-sys_inc_dir.patch index ac8b031cf5..49903d6ce8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent/0001-_setuputils.py-Do-not-add-sys_inc_dir.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent/0001-_setuputils.py-Do-not-add-sys_inc_dir.patch @@ -1,4 +1,4 @@ -From f3267ad7994a4b66e6bcf72cb0e418105f77bd52 Mon Sep 17 00:00:00 2001 +From 9eb453283a7ac8a9b1dd3eac86d936c7a430476b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 11 Oct 2022 17:37:01 -0700 Subject: [PATCH] _setuputils.py: Do not add sys_inc_dir @@ -10,15 +10,16 @@ we really do not need setuptools to deduce it for us. Upstream-Status: Inappropriate [ Cross-compile specific ] Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- _setuputils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_setuputils.py b/_setuputils.py -index d98f716..31134a4 100644 +index 4c25e00..23fdfe1 100644 --- a/_setuputils.py +++ b/_setuputils.py -@@ -161,7 +161,6 @@ def get_include_dirs(*extra_paths): +@@ -164,7 +164,6 @@ def get_include_dirs(*extra_paths): # Neither sysconfig dir is not enough if we're in a virtualenv; the greenlet.h # header goes into a site/ subdir. See https://github.com/pypa/pip/issues/4610 dist_inc_dir = os.path.abspath(dist_sysconfig.get_python_inc()) # 1 @@ -26,7 +27,7 @@ index d98f716..31134a4 100644 venv_include_dir = os.path.join( sys.prefix, 'include', 'site', 'python' + sysconfig.get_python_version() -@@ -175,7 +174,7 @@ def get_include_dirs(*extra_paths): +@@ -178,7 +177,7 @@ def get_include_dirs(*extra_paths): return [ p @@ -35,6 +36,3 @@ index d98f716..31134a4 100644 if os.path.exists(p) ] --- -2.38.0 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_23.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb index 0caebce282..fbdbf8ccc7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_23.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb @@ -4,16 +4,18 @@ a high-level synchronous API on top of the libevent event loop." HOMEPAGE = "http://www.gevent.org" LICENSE = "MIT & Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65" -DEPENDS += "${PYTHON_PN}-greenlet libev libuv c-ares python3-cython-native" +DEPENDS += "python3-greenlet libev libuv c-ares python3-cython-native" -RDEPENDS:${PN} = "${PYTHON_PN}-greenlet \ - ${PYTHON_PN}-mime \ - ${PYTHON_PN}-pprint \ +RDEPENDS:${PN} = "python3-greenlet \ + python3-mime \ + python3-pprint \ + python3-zopeevent \ + python3-zopeinterface \ " SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch" -SRC_URI[sha256sum] = "72c002235390d46f94938a96920d8856d4ffd9ddf62a303a0d7c118894097e34" +SRC_URI[sha256sum] = "432fc76f680acf7cf188c2ee0f5d3ab73b63c1f03114c7cd8a34cebbe5aa2056" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.16.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.16.2.bb index 4d13b2e78e..ecb15ba3c5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.16.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.16.2.bb @@ -8,18 +8,18 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "032d37b45d1d6bdaf68fb11ff621e2593263a239fa9246e2e94325f9c47876d2" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ + python3-asyncio \ + python3-datetime \ + python3-logging \ + python3-math \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-googleapis-common-protos \ - ${PYTHON_PN}-google-auth \ - ${PYTHON_PN}-grpcio \ - ${PYTHON_PN}-protobuf \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-six \ + python3-googleapis-common-protos \ + python3-google-auth \ + python3-grpcio \ + python3-protobuf \ + python3-pytz \ + python3-requests \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.116.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.118.0.bb index e4de12baec..6a27006b79 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.116.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.118.0.bb @@ -4,17 +4,17 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "f9f32361e16114d62929638fe07f77be30216b079ad316dc2ced859d9f72e5ad" +SRC_URI[sha256sum] = "ebf4927a3f5184096647be8f705d090e7f06d48ad82b0fa431a2fe80c2cbe182" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-httplib2 \ - ${PYTHON_PN}-uritemplate \ - ${PYTHON_PN}-google-api-core \ + python3-logging \ + python3-six \ + python3-json \ + python3-core \ + python3-netclient \ + python3-httplib2 \ + python3-uritemplate \ + python3-google-api-core \ " 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 index b1e89e4b44..5c071ac413 100644 --- 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 @@ -9,6 +9,6 @@ SRC_URI[sha256sum] = "292d2d3783349f2b0734a0a0207b1e1e322ac193c2c09d8f7c613fb7cc inherit pypi setuptools3 RDEPENDS:${PN} = " \ - ${PYTHON_PN}-google-auth \ - ${PYTHON_PN}-requests-oauthlib \ + python3-google-auth \ + python3-requests-oauthlib \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.27.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.27.0.bb deleted file mode 100644 index 45098e6628..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.27.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Google Authentication Library" -HOMEPAGE = "https://github.com/googleapis/google-auth-library-python" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "e863a56ccc2d8efa83df7a80272601e43487fa9a728a376205c86c26aaefa821" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ -" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-aiohttp \ - ${PYTHON_PN}-cachetools \ - ${PYTHON_PN}-pyasn1-modules \ - ${PYTHON_PN}-rsa \ - ${PYTHON_PN}-six \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.28.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.28.0.bb new file mode 100644 index 0000000000..5799db43ba --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.28.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Google Authentication Library" +HOMEPAGE = "https://github.com/googleapis/google-auth-library-python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "3cfc1b6e4e64797584fb53fc9bd0b7afa9b7c0dba2004fa7dcc9349e58cc3195" + +RDEPENDS:${PN} += "\ + python3-asyncio \ + python3-datetime \ + python3-io \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-numbers \ +" + +RDEPENDS:${PN} += "\ + python3-aiohttp \ + python3-cachetools \ + python3-pyasn1-modules \ + python3-rsa \ + python3-six \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.62.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.62.0.bb index 1536ba5e0d..5df1210dab 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.62.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.62.0.bb @@ -8,6 +8,6 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-grpcio \ - ${PYTHON_PN}-protobuf \ + python3-grpcio \ + python3-protobuf \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.20.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.20.1.bb index 506c738133..d381699a89 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.20.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-graphviz_0.20.1.bb @@ -10,7 +10,7 @@ inherit pypi setuptools3 PYPI_PACKAGE_EXT = "zip" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ + python3-logging \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb index 0ec9d95a47..07f5fe4c2a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools_1.60.1.bb @@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62 inherit pypi setuptools3 -DEPENDS += "${PYTHON_PN}-grpcio" +DEPENDS += "python3-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] = "da08224ab8675c6d464b988bd8ca02cccd2bf0275bceefe8f6219bfd4a4f5e85" -RDEPENDS:${PN} = "${PYTHON_PN}-grpcio" +RDEPENDS:${PN} = "python3-grpcio" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb index 6bcb31656c..b00f8681c5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.60.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "Apache-2.0 & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906" -DEPENDS += "${PYTHON_PN}-protobuf" +DEPENDS += "python3-protobuf" SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ file://abseil-ppc-fixes.patch \ @@ -12,9 +12,9 @@ SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ " SRC_URI[sha256sum] = "dd1d3a8d1d2e50ad9b59e10aa7f07c7d1be2b367f3f2d33c5fade96ed5460962" -RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-six \ +RDEPENDS:${PN} = "python3-protobuf \ + python3-setuptools \ + python3-six \ " inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb index ee44e837e1..d6272a07c3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-html5lib_1.1.bb @@ -8,10 +8,10 @@ SRC_URI[sha256sum] = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c1 inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-lxml \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-webencodings \ - ${PYTHON_PN}-xml \ + python3-lxml \ + python3-six \ + python3-webencodings \ + python3-xml \ " BBCLASSEXTEND = "native nativesdk" 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.3.bb index 3bfe5ed4ae..203bfd48a1 100644 --- 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.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1c1f23b073da202e1f4f9e426490210c" inherit pypi python_hatchling -SRC_URI[sha256sum] = "9fc092e4799b26174648e54b74ed5f683132a464e95643b226e00c2ed2fa6535" +SRC_URI[sha256sum] = "5c0f9546ad17dac4d0772b0808856eb616eb8b48ce94f49ed819fd6982a8a544" DEPENDS += "\ python3-hatch-fancy-pypi-readme-native \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.22.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.22.0.bb index 9614de920e..9318ad9182 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.22.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-httplib2_0.22.0.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "d7a10bc5ef5ab08322488bde8c726eeee5c8618723fdb399597ec58f3d inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "\ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-pyparsing \ + python3-compression \ + python3-netclient \ + python3-pyparsing \ " 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 index 9abd13e2be..50bff7f851 100644 --- 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 @@ -36,9 +36,9 @@ RDEPENDS:${PN}-cli += "\ " FILES:${PN} = "\ - /usr/lib/python${PYTHON_BASEVERSION} \ + ${libdir}/${PYTHON_DIR} \ " FILES:${PN}-cli = "\ - /usr/bin/httpx \ + ${bindir}/httpx \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_10.0.bb index 7d185989d9..b32fe2e1d0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanfriendly_10.0.bb @@ -11,14 +11,14 @@ SRC_URI[sha256sum] = "6b0b831ce8f15f7300721aa49829fc4e83921a9a301cc7f606be6686a2 inherit pypi setuptools3 RDEPENDS:${PN}:class-target += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-stringold \ + python3-datetime \ + python3-fcntl \ + python3-io \ + python3-logging \ + python3-math \ + python3-numbers \ + python3-shell \ + python3-stringold \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.9.0.bb index d74070876d..da1eea4cf7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.9.0.bb @@ -10,13 +10,13 @@ SRC_URI[sha256sum] = "582a265c931c683a7e9b8ed9559089dea7edcf6cc95be39a3cbc2c5d5a inherit pypi python_hatchling DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-hatch-vcs-native \ + python3-setuptools-scm-native \ + python3-hatch-vcs-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-setuptools \ + python3-datetime \ + python3-setuptools \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb index 7cdecf1094..a3fae39c7f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-hyperlink_21.0.0.bb @@ -7,7 +7,7 @@ SRC_URI[sha256sum] = "427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d27 inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} += "${PYTHON_PN}-stringold ${PYTHON_PN}-netclient ${PYTHON_PN}-idna" +RDEPENDS:${PN} += "python3-stringold python3-netclient python3-idna" PACKAGES =. "${PN}-test " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.2.0.bb index 6c97c374e0..371bbf2ab5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ifaddr_0.2.0.bb @@ -10,5 +10,5 @@ SRC_URI[sha256sum] = "cc0cbfcaabf765d44595825fb96a99bb12c79716b73b44330ea38ee2b0 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ctypes \ + python3-ctypes \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.34.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.34.0.bb index 8653983ca7..e38d694408 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.34.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.34.0.bb @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "ae9732e10acf807a22c389aef193f42215718e16bd06eed0c5bb57e103 inherit pypi setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-numpy ${PYTHON_PN}-pillow" +RDEPENDS:${PN} = "python3-numpy python3-pillow" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb index 016bafc134..3d93cc05e9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb @@ -8,12 +8,12 @@ SRC_URI[sha256sum] = "912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c2 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-twisted \ - ${PYTHON_PN}-click \ + python3-twisted \ + python3-click \ " # -native is needed to build python[3]-twisted, however, we need to take steps to # prevent a circular dependency. The build apparently does not use the part of # python-incremental which uses python-twisted, so this hack is OK. -RDEPENDS:${PYTHON_PN}-incremental-native:remove = "${PYTHON_PN}-twisted-native" +RDEPENDS:python3-incremental-native:remove = "python3-twisted-native" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb index d3b557406c..2ccc98e36b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb @@ -11,6 +11,6 @@ SRC_URI[sha256sum] = "3278827b803cf006a1df251f3e13374c7d26db779e5a33329cc11789b8 PYPI_PACKAGE = "inflate64" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-importlib-metadata \ + python3-core \ + python3-importlib-metadata \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.21.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.21.0.bb index 86e4c6454f..7f5dde768f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.21.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.21.0.bb @@ -8,21 +8,21 @@ PYPI_PACKAGE = "ipython" SRC_URI[sha256sum] = "48fbc236fbe0e138b88773fa0437751f14c3645fb483f1d4c5dee58b37e5ce73" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-jedi \ - ${PYTHON_PN}-decorator \ - ${PYTHON_PN}-pickleshare \ - ${PYTHON_PN}-traitlets \ - ${PYTHON_PN}-prompt-toolkit \ - ${PYTHON_PN}-pygments \ - ${PYTHON_PN}-backcall \ - ${PYTHON_PN}-pydoc \ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-pexpect \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-sqlite3 \ - ${PYTHON_PN}-stack-data \ + python3-setuptools \ + python3-jedi \ + python3-decorator \ + python3-pickleshare \ + python3-traitlets \ + python3-prompt-toolkit \ + python3-pygments \ + python3-backcall \ + python3-pydoc \ + python3-debugger \ + python3-pexpect \ + python3-unixadmin \ + python3-misc \ + python3-sqlite3 \ + python3-stack-data \ " inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb index 2e8c7e7802..5af1d594b3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb @@ -10,8 +10,8 @@ inherit pypi setuptools3 CLEANBROKEN = "1" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-simplejson \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-json \ + python3-simplejson \ + python3-netclient \ + python3-compression \ + python3-json \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.1.bb index 1b65f3bc9e..22a798529f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdatetime_4.1.1.bb @@ -12,6 +12,6 @@ inherit pypi setuptools3 CLEANBROKEN = "1" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-modules \ + python3-modules \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal/run-ptest index 5cec711696..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb index 8655150b03..afabe14a8a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jdcal_1.4.1.bb @@ -12,14 +12,15 @@ inherit pypi setuptools3 ptest SRC_URI[md5sum] = "e05bdb60fa80f25bc60e73e0c6b7c5dc" SRC_URI[sha256sum] = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8" -RDEPENDS:${PN} += "${PYTHON_PN}-compression ${PYTHON_PN}-io ${PYTHON_PN}-pprint ${PYTHON_PN}-shell" +RDEPENDS:${PN} += "python3-compression python3-io python3-pprint python3-shell" 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-jedi_0.19.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.19.1.bb index f335625188..56395c3b5d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.19.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jedi_0.19.1.bb @@ -8,12 +8,12 @@ PYPI_PACKAGE = "jedi" SRC_URI[sha256sum] = "cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd" RDEPENDS:${PN} = " \ - ${PYTHON_PN}-parso \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-pydoc \ - ${PYTHON_PN}-compile \ - ${PYTHON_PN}-json \ + python3-parso \ + python3-core \ + python3-compression \ + python3-pydoc \ + python3-compile \ + python3-json \ " inherit setuptools3 pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsbeautifier_1.14.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsbeautifier_1.15.1.bb index 7b438778e9..5a0e5a8499 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsbeautifier_1.14.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsbeautifier_1.15.1.bb @@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148 inherit pypi setuptools3 -SRC_URI[sha256sum] = "6b632581ea60dd1c133cd25a48ad187b4b91f526623c4b0fb5443ef805250505" +SRC_URI[sha256sum] = "ebd733b560704c602d744eafc839db60a1ee9326e30a2a80c4adb8718adc1b24" PYPI_PACKAGE="jsbeautifier" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-shell \ + python3-core \ + python3-stringold \ + python3-shell \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin/7a75d76c2d6bfb917f30ced8f5c0a9a4157f7819.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin/7a75d76c2d6bfb917f30ced8f5c0a9a4157f7819.patch new file mode 100644 index 0000000000..2646e2f5a0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin/7a75d76c2d6bfb917f30ced8f5c0a9a4157f7819.patch @@ -0,0 +1,82 @@ +From 7a75d76c2d6bfb917f30ced8f5c0a9a4157f7819 Mon Sep 17 00:00:00 2001 +From: aekoroglu <ali.erdinc.koroglu@intel.com> +Date: Fri, 24 Jun 2022 14:12:59 +0300 +Subject: [PATCH] DeprecationWarning invalid escape sequence fix + +Upstream-Status: Submitted [https://github.com/tikitu/jsmin/pull/38] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + jsmin/test.py | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/jsmin/test.py b/jsmin/test.py +index 173ac65..afea4e7 100644 +--- a/jsmin/test.py ++++ b/jsmin/test.py +@@ -337,8 +337,8 @@ def testImplicitSemicolon3(self): + self.assertMinified("return//comment...\r\na", "return\na") + + def testSingleComment2(self): +- self.assertMinified('x.replace(/\//, "_")// slash to underscore', +- 'x.replace(/\//,"_")') ++ self.assertMinified('x.replace(/\\//, "_")// slash to underscore', ++ 'x.replace(/\\//,"_")') + + def testSlashesNearComments(self): + original = ''' +@@ -383,8 +383,8 @@ def test_space_in_regex(self): + self.assertMinified(original, original) + + def test_brackets_around_slashed_regex(self): +- original = 'function a() { /\//.test("a") }' +- expected = 'function a(){/\//.test("a")}' ++ original = 'function a() { /\\//.test("a") }' ++ expected = 'function a(){/\\//.test("a")}' + self.assertMinified(original, expected) + + def test_angular_1(self): +@@ -455,12 +455,12 @@ def testBackticksTagged(self): + def test_issue_bitbucket_16(self): + original = """ + f = function() { +- return /DataTree\/(.*)\//.exec(this._url)[1]; ++ return /DataTree\\/(.*)\\//.exec(this._url)[1]; + } + """ + self.assertMinified( + original, +- 'f=function(){return /DataTree\/(.*)\//.exec(this._url)[1];}') ++ 'f=function(){return /DataTree\\/(.*)\\//.exec(this._url)[1];}') + + def test_issue_bitbucket_17(self): + original = "// hi\n/^(get|post|head|put)$/i.test('POST')" +@@ -470,7 +470,7 @@ def test_issue_bitbucket_17(self): + def test_issue_6(self): + original = ''' + respond.regex = { +- comments: /\/\*[^*]*\*+([^/][^*]*\*+)*\//gi, ++ comments: /\\/\\*[^*]*\\*+([^/][^*]*\\*+)*\\//gi, + urls: 'whatever' + }; + ''' +@@ -548,16 +548,16 @@ def test_issue_9_multi_comments(self): + + def test_issue_12_re_nl_if(self): + original = ''' +- var re = /\d{4}/ ++ var re = /\\d{4}/ + if (1) { console.log(2); }''' + self.assertMinified( +- original, 'var re=/\d{4}/\nif(1){console.log(2);}') ++ original, 'var re=/\\d{4}/\nif(1){console.log(2);}') + + def test_issue_12_re_nl_other(self): + original = ''' +- var re = /\d{4}/ ++ var re = /\\d{4}/ + g = 10''' +- self.assertMinified(original , 'var re=/\d{4}/\ng=10') ++ self.assertMinified(original , 'var re=/\\d{4}/\ng=10') + + def test_preserve_copyright(self): + original = ''' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin/run-ptest index cbcfffda5b..586608d7b2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin/run-ptest @@ -1,3 +1,2 @@ #!/bin/sh - -python3 test.py +pytest -vv 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}}' diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin_3.0.1.bb index 51b17066ee..c3129e7b53 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsmin_3.0.1.bb @@ -10,11 +10,12 @@ SRC_URI[sha256sum] = "c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5 BBCLASSEXTEND = "native nativesdk" SRC_URI += " \ + file://7a75d76c2d6bfb917f30ced8f5c0a9a4157f7819.patch \ file://run-ptest \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.33.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.33.bb index 3d6deb2a61..6a1715c6df 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.33.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-jsonpatch_1.33.bb @@ -8,8 +8,8 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "9fcd4009c41e6d12348b4a0ff2563ba56a2923a7dfee731d004e212e1ee5030c" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-jsonpointer \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-stringold \ + python3-json \ + python3-jsonpointer \ + python3-netclient \ + python3-stringold \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.64.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.65.bb index 8fb8c6e88f..fa9edc67d4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.64.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.65.bb @@ -6,7 +6,7 @@ SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[sha256sum] = "1297b7f6e33160887fe08a88176aa0ea873b810a55f2a2740257b124184b067a" +SRC_URI[sha256sum] = "791ec5403859704e1dee4d2a056a30ec21d1e7bc040658ce62c40e0427ba4333" inherit pypi setuptools3 python3native @@ -16,8 +16,8 @@ DISTUTILS_INSTALL_ARGS += " \ FILES:${PN} += "${datadir}/*" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-xml \ + python3-compression \ + python3-doctest \ + python3-logging \ + python3-xml \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb index 9232a5a917..263c46869f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=d606e94f56c21c8e0cdde0b622dcdf57" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native ${PYTHON_PN}-pip-native" +DEPENDS += "python3-setuptools-scm-native python3-pip-native" SRC_URI[sha256sum] = "78247b6d45f43a52ef35c25b5581459e85117225408a4128a3daf8bf9648ac69" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb index a855c39141..97b3e72364 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lorem_0.1.1.bb @@ -19,8 +19,8 @@ RDEPENDS:${PN} += " \ python3 \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unittest-automake-output \ + python3-pytest \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.4.2.bb index c2a18c0fd8..90967f8e56 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-core_2.4.2.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "963c264164d4374f549d57db09599e0ca458cea1bd05e16939897619be PYPI_PACKAGE = "luma.core" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pillow \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-smbus2 \ + python3-pillow \ + python3-threading \ + python3-smbus2 \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb index 13ced6b204..95f066affe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb @@ -15,5 +15,5 @@ CLEANBROKEN = "1" PYPI_PACKAGE = "luma.oled" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-luma-core \ + python3-luma-core \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb index 062a63a39c..1d8c22d196 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-m2crypto_0.40.1.bb @@ -18,13 +18,13 @@ inherit pypi siteinfo setuptools3 DEPENDS += "openssl swig-native" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-xmlrpc \ + python3-datetime \ + python3-setuptools \ + python3-logging \ + python3-netclient \ + python3-netserver \ + python3-numbers \ + python3-xmlrpc \ " DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb index 265b28a771..5304917842 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mccabe_0.7.0.bb @@ -8,6 +8,6 @@ SRC_URI[sha256sum] = "348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f inherit pypi setuptools3 -DEPENDS += "${PYTHON_PN}-pytest-runner-native" +DEPENDS += "python3-pytest-runner-native" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-meson-python_0.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-meson-python_0.15.0.bb deleted file mode 100644 index c4b01a3832..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-meson-python_0.15.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Meson Python build backend (PEP 517)" -HOMEPAGE = "https://github.com/mesonbuild/meson-python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d580b27e67cc0892a5b005b0be114b60" - -DEPENDS = " \ - meson-native ninja-native patchelf-native \ - python3-pyproject-metadata-native \ -" - -PYPI_PACKAGE = "meson_python" - -inherit pypi python_mesonpy -SRC_URI[sha256sum] = "fddb73eecd49e89c1c41c87937cd89c2d0b65a1c63ba28238681d4bd9484d26f" - -DEPENDS:remove:class-native = "python3-meson-python-native" - -RDEPENDS:${PN} = " \ - meson ninja patchelf \ - python3-pyproject-metadata \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb index 01dd8bfb44..236fbd85bc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mpmath_1.3.0.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a inherit pypi setuptools3 -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += " \ python3-image \ python3-math \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack/run-ptest index 5cec711696..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.7.bb index 79943b55e4..5180301f7b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.7.bb @@ -7,7 +7,7 @@ inherit pypi setuptools3 ptest SRC_URI[sha256sum] = "572efc93db7a4d27e404501975ca6d2d9775705c2d922390d878fcf768d92c87" RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-io \ + python3-io \ " BBCLASSEXTEND = "native nativesdk" @@ -17,7 +17,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-multivolumefile_0.2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-multivolumefile_0.2.3.bb index c82113101b..2fd698138e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-multivolumefile_0.2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-multivolumefile_0.2.3.bb @@ -9,13 +9,13 @@ SRC_URI[sha256sum] = "a0648d0aafbc96e59198d5c17e9acad7eb531abea51035d08ce8060dca inherit python_setuptools_build_meta pypi DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-toml-native \ - ${PYTHON_PN}-wheel-native \ + python3-setuptools-scm-native \ + python3-toml-native \ + python3-wheel-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-mmap \ + python3-io \ + python3-core \ + python3-mmap \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_3.1.bb index 7158f7b057..3860238096 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-networkx_3.1.bb @@ -8,14 +8,14 @@ SRC_URI[sha256sum] = "de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb1 inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-decorator \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-threading \ + python3-decorator \ + python3-netclient \ + python3-compression \ + python3-numbers \ + python3-pickle \ + python3-html \ + python3-xml \ + python3-json \ + python3-profile \ + python3-threading \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.1.bb index a9e0ed208c..8f2e6528db 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ninja_1.11.1.1.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "9d793b08dd857e38d0b6ffe9e6b7145d7c485a42dcfea04905ca0cdb60 SRC_URI += "file://no-scikit-build.patch \ file://run-ninja-from-path.patch" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" do_install:append () { rm -rf ${D}${bindir} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb index 0a6de2d6b6..5fe9ab4e39 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -DEPENDS += "${PYTHON_PN}-wheel-native" +DEPENDS += "python3-wheel-native" PYPI_PACKAGE = "python3-nmap" @@ -13,6 +13,6 @@ SRC_URI[sha256sum] = "892b5091cde429fabfb8ba63382b2db8fd795193ba147558d0a7d5534c inherit pypi setuptools3 RDEPENDS:${PN} += "nmap \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-simplejson \ + python3-requests \ + python3-simplejson \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_2.0.1.bb index 6185b7b1e9..5a29858177 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_2.0.1.bb @@ -8,5 +8,5 @@ SRC_URI[sha256sum] = "960cb699f1209da80ac39e3ab50aa7342fe8ca9f70606c23447a510550 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-six \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb index 29a3c86067..2ad42247d9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.0.bb @@ -8,5 +8,5 @@ SRC_URI[sha256sum] = "456aa000c6777c5d21b029c52e532f94328d4fb4f15ad2a4dd3dd62db3 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-six \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.4.0.bb index d78bec046f..d0a8d7a823 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ntplib_0.4.0.bb @@ -8,4 +8,4 @@ SRC_URI[sha256sum] = "899d8fb5f8c2555213aea95efca02934c7343df6ace9d7628a5176b176 inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-datetime ${PYTHON_PN}-io" +RDEPENDS:${PN} += "python3-datetime python3-io" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.2.2.bb index 566279d71c..833fdbcc58 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-oauthlib_3.2.2.bb @@ -14,9 +14,9 @@ inherit pypi setuptools3 # # Uncomment this line to enable all the optional features. #PACKAGECONFIG ?= "test signedtoken signals rsa" -PACKAGECONFIG[test] = ",,,${PYTHON_PN}-blinker ${PYTHON_PN}-cryptography ${PYTHON_PN}-pytest ${PYTHON_PN}-pyjwt" -PACKAGECONFIG[signedtoken] = ",,,${PYTHON_PN}-cryptography ${PYTHON_PN}-pyjwt" -PACKAGECONFIG[signals] = ",,,${PYTHON_PN}-blinker" -PACKAGECONFIG[rsa] = ",,,${PYTHON_PN}-cryptography" +PACKAGECONFIG[test] = ",,,python3-blinker python3-cryptography python3-pytest python3-pyjwt" +PACKAGECONFIG[signedtoken] = ",,,python3-cryptography python3-pyjwt" +PACKAGECONFIG[signals] = ",,,python3-blinker" +PACKAGECONFIG[rsa] = ",,,python3-cryptography" -RDEPENDS:${PN} += "${PYTHON_PN}-core ${PYTHON_PN}-crypt ${PYTHON_PN}-datetime ${PYTHON_PN}-json ${PYTHON_PN}-logging ${PYTHON_PN}-math ${PYTHON_PN}-netclient ${PYTHON_PN}-unittest" +RDEPENDS:${PN} += "python3-core python3-crypt python3-datetime python3-json python3-logging python3-math python3-netclient python3-unittest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.2.bb index d78642a9bd..cf3daae6ac 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-obd_0.7.2.bb @@ -6,4 +6,4 @@ SRC_URI[sha256sum] = "20d38c9ded3daad1e8affab3ff367a70788d4f29ac77ab7aacddc6a6d2 inherit setuptools3 pypi -RDEPENDS:${PN} += "${PYTHON_PN}-pyserial ${PYTHON_PN}-pint ${PYTHON_PN}-setuptools ${PYTHON_PN}-packaging" +RDEPENDS:${PN} += "python3-pyserial python3-pint python3-setuptools python3-packaging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-olefile_0.47.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-olefile_0.47.bb index 2db0adad8b..bb6fa7a8cc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-olefile_0.47.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-olefile_0.47.bb @@ -11,7 +11,7 @@ PYPI_PACKAGE = "olefile" PYPI_PACKAGE_EXT = "zip" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-logging \ + python3-core \ + python3-datetime \ + python3-logging \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.2.bb index a889210616..4a3254cc53 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.2.bb @@ -12,12 +12,12 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "a6f5977418eff3b2d5500d54d9db50c8277a368436f4e4f8ddb1be3422870184" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-jdcal \ - ${PYTHON_PN}-et-xmlfile \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-xml \ + python3-compression \ + python3-io \ + python3-pprint \ + python3-shell \ + python3-jdcal \ + python3-et-xmlfile \ + python3-numbers \ + python3-xml \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set/run-ptest index c27a6c3c57..64799ba008 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest test_ordered_set.py +pytest --automake test_ordered_set.py diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_4.1.0.bb index f2f1cf8e45..64637b858d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_4.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ordered-set_4.1.0.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-paho-mqtt_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.6.1.bb index 81a6d0a9c9..9055772b57 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_1.6.1.bb @@ -9,7 +9,7 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "2a8291c81623aec00372b5a85558a372c747cbca8e9934dfe218638b8eefc26f" -DEPENDS += "${PYTHON_PN}-pytest-runner-native" +DEPENDS += "python3-pytest-runner-native" do_install:append() { install -d -m0755 ${D}${datadir}/${BPN}/examples @@ -18,16 +18,16 @@ do_install:append() { PACKAGES =+ "${PN}-examples" -RDEPENDS:${PN}-examples += "${PN} ${PYTHON_PN}-core" +RDEPENDS:${PN}-examples += "${PN} python3-core" FILES:${PN}-examples = "${datadir}/${BPN}/examples" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-threading \ + python3-io \ + python3-logging \ + python3-math \ + python3-netclient \ + python3-threading \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb index 5e69fea6c1..91e76d9919 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb @@ -11,9 +11,9 @@ SRC_URI[sha256sum] = "c02f372a88e0d17f36d3093a644c73cfc1788e876a7c4bcb4020a77512 inherit pypi setuptools3 DEPENDS += " \ - ${PYTHON_PN}-cython-native \ - ${PYTHON_PN}-numpy-native \ - ${PYTHON_PN}-versioneer-native \ + python3-cython-native \ + python3-numpy-native \ + python3-versioneer-native \ " PACKAGESPLITFUNCS =+ "fix_cythonized_sources" @@ -29,10 +29,10 @@ fix_cythonized_sources() { CFLAGS:append:toolchain-clang = " -Wno-error=deprecated-declarations" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-numpy \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-dateutil-zoneinfo \ - ${PYTHON_PN}-pytz \ - ${PYTHON_PN}-profile \ + python3-json \ + python3-numpy \ + python3-dateutil \ + python3-dateutil-zoneinfo \ + python3-pytz \ + python3-profile \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb index 14c90ffb58..1fc967d953 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parallax_1.0.6.bb @@ -8,6 +8,6 @@ SRC_URI[sha256sum] = "c16703202ff67aed4740c0727df304abe9f3e7851e653533b24de21b33 inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-fcntl ${PYTHON_PN}-threading ${PYTHON_PN}-unixadmin" +RDEPENDS:${PN} += "python3-fcntl python3-threading python3-unixadmin" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse/run-ptest index 40c284799d..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse/run-ptest @@ -1,2 +1,3 @@ #!/bin/sh -pytest + +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb index 610a966d40..d2b91b3f30 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb @@ -19,6 +19,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-parso_0.8.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.3.bb index ce3471da6a..217c821fb4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parso_0.8.3.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f9170 inherit setuptools3 pypi RDEPENDS:${PN} = " \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-logging \ + python3-crypt \ + python3-difflib \ + python3-logging \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb index dc692303fe..8b66e25922 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb @@ -15,7 +15,7 @@ SRC_URI[sha256sum] = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c415 inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ + python3-crypt \ + python3-logging \ + python3-netclient \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.12.3.bb index 3361bb8338..0862eab6a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.12.3.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "53cdab727c1469fdc196efd8d7ff8404a3ca91ee43c0a5714736f2020d inherit pypi python_setuptools_build_meta DEPENDS += " \ - ${PYTHON_PN}-pdm-backend-native \ + python3-pdm-backend-native \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb index f3e03ed309..68507e2482 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pep8_1.7.1.bb @@ -9,9 +9,9 @@ SRC_URI[sha256sum] = "603a46e5c358ce20ac4807a0eeafac7505d1125a4c1bd8378757ada06f inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-prettytable \ - ${PYTHON_PN}-cmd2 \ - ${PYTHON_PN}-pyparsing" +RDEPENDS:${PN} += "python3-prettytable \ + python3-cmd2 \ + python3-pyparsing" SRC_URI[md5sum] = "603821d06db945c71d811b5a8d78423c" SRC_URI[sha256sum] = "fe249b52e20498e59e0b5c5256aa52ee99fc295b26ec9eaa85776ffdb9fe6374" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.4.1.bb index e284ccc33a..c2764b27d2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-periphery_2.4.1.bb @@ -10,6 +10,6 @@ inherit pypi setuptools3 PYPI_PACKAGE = "python-periphery" -RDEPENDS:${PN} += "${PYTHON_PN}-mmap \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl" +RDEPENDS:${PN} += "python3-mmap \ + python3-ctypes \ + python3-fcntl" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.9.0.bb index 6ee5b25bda..521df9dcd4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pexpect_4.9.0.bb @@ -13,12 +13,12 @@ inherit pypi setuptools3 UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pexpect" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-resource \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-ptyprocess \ + python3-core \ + python3-io \ + python3-terminal \ + python3-resource \ + python3-fcntl \ + python3-ptyprocess \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb index 412dcfce40..c90f551056 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pid_3.0.4.bb @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "0e33670e83f6a33ebb0822e43a609c3247178d4a375ff50a4689e266d8 inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-fcntl ${PYTHON_PN}-logging ${PYTHON_PN}-io" +RDEPENDS:${PN} += "python3-fcntl python3-logging python3-io" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.3.2.bb index d5100dd78e..865accc595 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pika_1.3.2.bb @@ -15,12 +15,12 @@ inherit pypi python_setuptools_build_meta PYPI_PACKAGE = "pika" DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-toml-native \ + python3-setuptools-scm-native \ + python3-toml-native \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-tornado \ - ${PYTHON_PN}-twisted \ + python3-logging \ + python3-tornado \ + python3-twisted \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.23.bb index 82709ea08a..ad3e13e5dd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.23.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.23.bb @@ -21,12 +21,12 @@ SRC_URI += " \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-packaging \ + python3-setuptools \ + python3-packaging \ " RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb index 1aa91deac5..9ff4d1318d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pkgconfig_1.5.5.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=faa7f82be8f220bff6156be4790344fc" SRC_URI[sha256sum] = "deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899" RDEPENDS:${PN} = "pkgconfig \ - ${PYTHON_PN}-shell \ + python3-shell \ " inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx/0001-cython-Use-cythyon3-in-cmake-check.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx/0001-cython-Use-cythyon3-in-cmake-check.patch new file mode 100644 index 0000000000..40b2544d55 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx/0001-cython-Use-cythyon3-in-cmake-check.patch @@ -0,0 +1,29 @@ +From 5e6eb640f54a0d716d62ab4db8d96d3b6f3aa7bc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 19 Feb 2024 22:11:41 -0800 +Subject: [PATCH] cython: Use cythyon3 in cmake check + +OE does not install cython anymore, it only has cython3 +therefore point the build system to find cython3 + +Upstream-Status: Inappropriate [ OE-Specific ] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cython/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cython/CMakeLists.txt b/cython/CMakeLists.txt +index daa4f76..93dd030 100644 +--- a/cython/CMakeLists.txt ++++ b/cython/CMakeLists.txt +@@ -1,5 +1,5 @@ + find_package(Python COMPONENTS Interpreter Development.Module REQUIRED) +-find_program(CYTHON "cython") ++find_program(CYTHON "cython3") + + if(NOT USE_INSTALLED_POCKETSPHINX) + set_property(TARGET pocketsphinx PROPERTY POSITION_INDEPENDENT_CODE on) +-- +2.43.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx_0.1.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx_0.1.15.bb deleted file mode 100644 index f7ffd9d268..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx_0.1.15.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "This package provides a python interface to CMU Sphinxbase and Pocketsphinx libraries created with SWIG and Setuptools." -DESCRIPTION = "Python interface to CMU Sphinxbase and Pocketsphinx libraries" -HOMEPAGE = "https://github.com/bambocher/pocketsphinx-python" -SECTION = "devel/python" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=826ebda787eb48e78aec2624f9faba72" - -SRC_URI[md5sum] = "94d008eebea16acb60a9ffe614575dee" -SRC_URI[sha256sum] = "34d290745c7dbe6fa2cac9815b5c19d10f393e528ecd70e779c21ebc448f9b63" - -inherit pypi setuptools3 features_check - -DEPENDS += "swig-native pulseaudio" -REQUIRED_DISTRO_FEATURES += "pulseaudio" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx_5.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx_5.0.3.bb new file mode 100644 index 0000000000..4ffcb4db82 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pocketsphinx_5.0.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "Python interface to Pocketsphinx libraries." +DESCRIPTION = "Pythonsphinx is an Open source large vocabulary, speaker-independent continuous speech recognition engines." +HOMEPAGE = "https://github.com/cmusphinx/pocketsphinx" +SECTION = "devel/python" +LICENSE = "BSD-2-Clause | BSD-3-Clause | MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c4d720cdc9c6953091f65e8b01524bb4" + +SRC_URI += "file://0001-cython-Use-cythyon3-in-cmake-check.patch" +SRC_URI[sha256sum] = "27f4de0ca2d2bce391ce87eaab84fe6f0bc059b306fd1702d5fe6549b66e1586" + +inherit cmake pkgconfig pypi python3native + +DEPENDS += "swig-native python3-cython-native python3-scikit-build-native gstreamer1.0 gstreamer1.0-plugins-base" + +EXTRA_OECMAKE += "-DBUILD_GSTREAMER=ON" + +PACKAGES += "${PN}-models ${MLPREFIX}gstreamer1.0-pocketsphinx" + +FILES:${MLPREFIX}gstreamer1.0-pocketsphinx = "${libdir}/gstreamer-1.0/" +FILES:${PN}-models = "${datadir}/pocketsphinx/model" 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.2.bb index 4abe167f7b..00cb51be41 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.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/frederickjansen/polyline" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=1fb8d1dc685695195bb3c1e48adfef48" -SRC_URI[sha256sum] = "74cb5cea098dddf09d1a5a1f17af9184d371cbf3e9723de0194e530ec39ca1f6" +SRC_URI[sha256sum] = "10541e759c5fd51f746ee304e9af94744089a4055b6257b293b3afd1df64e369" inherit pypi python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb index b4bbfc6c6f..3af94b48f1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb @@ -10,7 +10,7 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "5289b40d98959b16b3f6927781678935d3df1b7c14947f5d7778e5e04dd9a065" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-sortedcontainers \ + python3-sortedcontainers \ " BBCLASSEXTEND = "native" 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.10.0.bb index ba75057f59..35e9ab1798 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.10.0.bb @@ -3,7 +3,12 @@ HOMEPAGE = "http://code.google.com/p/prettytable" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c9a6829fcd174d9535b46211917c7671" -SRC_URI[sha256sum] = "f4ed94803c23073a90620b201965e5dc0bccf1760b7a7eaf3158cab8aaffdf34" + +SRC_URI[sha256sum] = "9665594d137fb08a1117518c25551e0ede1687197cf353a4fdc78d27e1073568" +SRC_URI += " \ + file://run-ptest \ +" +inherit pypi ptest python_hatchling do_install:append() { perm_files=`find "${D}${PYTHON_SITEPACKAGES_DIR}/" -name "*.txt" -o -name "PKG-INFO"` @@ -12,33 +17,29 @@ do_install:append() { done } -BBCLASSEXTEND = "native nativesdk" -inherit pypi ptest python_hatchling - -SRC_URI += " \ - file://run-ptest \ -" - DEPENDS += "\ python3-hatch-vcs-native \ " RDEPENDS:${PN} += " \ - python3-math \ - python3-html \ - python3-wcwidth \ - python3-json \ - python3-compression \ - python3-importlib-metadata \ + python3-compression \ + python3-html \ + python3-importlib-metadata \ + python3-json \ + python3-math \ + python3-wcwidth \ " RDEPENDS:${PN}-ptest += " \ python3-pytest \ - python3-pytest-lazy-fixture \ + python3-pytest-lazy-fixtures \ python3-sqlite3 \ python3-unittest-automake-output \ " do_install_ptest() { - cp -f ${S}/tests/test_prettytable.py ${D}${PTEST_PATH}/ + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.6.bb index 1333da98da..59d1f90e98 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-progress_1.6.bb @@ -8,8 +8,8 @@ SRC_URI[sha256sum] = "c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccf inherit pypi setuptools3 RDEPENDS:${PN}:class-target += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-math \ + python3-datetime \ + python3-math \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.43.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.43.bb index 9f7802b538..8b3b709763 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.43.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.43.bb @@ -10,16 +10,16 @@ inherit pypi setuptools3 PYPI_PACKAGE = "prompt_toolkit" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-wcwidth \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-image \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-xml \ + python3-core \ + python3-six \ + python3-terminal \ + python3-threading \ + python3-wcwidth \ + python3-datetime \ + python3-shell \ + python3-image \ + python3-asyncio \ + python3-xml \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb index 5333d306bd..8bb8a93f76 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=53dbfa56f61b90215a9f8f0d527c043d" inherit pypi setuptools3 -SRC_URI[sha256sum] = "fe599e175cb347efc8ee524bcd4b902d11f7262c0e569ececcb89995c15f0a5e" +SRC_URI[sha256sum] = "25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c" # http://errors.yoctoproject.org/Errors/Details/184715/ # Can't find required file: ../src/google/protobuf/descriptor.proto @@ -17,14 +17,14 @@ UPSTREAM_CHECK_REGEX = "protobuf/(?P<pver>\d+(\.\d+)+)/" DEPENDS += "protobuf" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-pkgutil \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-unittest \ + python3-datetime \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-numbers \ + python3-pkgutil \ + python3-six \ + python3-unittest \ " # For usage in other recipies when compiling protobuf files (e.g. by grpcio-tools) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-ubjson_0.16.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-ubjson_0.16.1.bb index 222eb1e0e8..0db9d65fd3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-ubjson_0.16.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-ubjson_0.16.1.bb @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "b9bfb8695a1c7e3632e800fb83c943bf67ed45ddd87cd0344851610c69 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-numbers \ + python3-numbers \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py7zr_0.20.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py7zr_0.20.8.bb index f9e6820ce1..3d48b5116f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-py7zr_0.20.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py7zr_0.20.8.bb @@ -9,21 +9,21 @@ SRC_URI[sha256sum] = "2a6b0db0441e63a2dd74cbd18f5d9ae7e08dc0e54685aa486361d0db6a inherit pypi python_setuptools_build_meta DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-toml-native \ - ${PYTHON_PN}-wheel-native \ + python3-setuptools-scm-native \ + python3-toml-native \ + python3-wheel-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-pycryptodomex \ - ${PYTHON_PN}-multivolumefile \ - ${PYTHON_PN}-pybcj \ - ${PYTHON_PN}-inflate64 \ - ${PYTHON_PN}-pyppmd \ - ${PYTHON_PN}-pyzstd \ - ${PYTHON_PN}-brotli \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-threading \ + python3-pycryptodomex \ + python3-multivolumefile \ + python3-pybcj \ + python3-inflate64 \ + python3-pyppmd \ + python3-pyzstd \ + python3-brotli \ + python3-multiprocessing \ + python3-datetime \ + python3-core \ + python3-threading \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybcj_1.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybcj_1.0.2.bb index 34ffb97933..8cb176f2b5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybcj_1.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybcj_1.0.2.bb @@ -11,14 +11,14 @@ inherit pypi python_setuptools_build_meta pypi #PROVIDES = "python3-pybcj" DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-toml-native \ - ${PYTHON_PN}-wheel-native \ + python3-setuptools-scm-native \ + python3-toml-native \ + python3-wheel-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-importlib-metadata \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-compression \ + python3-email \ + python3-importlib-metadata \ + python3-core \ + python3-compression \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch new file mode 100644 index 0000000000..37cb78a308 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch @@ -0,0 +1,52 @@ +From debd676cd94f92a30b3be45f1245aa13d8c398c0 Mon Sep 17 00:00:00 2001 +From: Philip Balister <philip@balister.org> +Date: Wed, 8 Jul 2020 09:41:43 -0400 +Subject: [PATCH] Do not strip binaries. + + * OpenEmbedded strips them after creating debug packages. + +Signed-off-by: Philip Balister <philip@balister.org> +Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> +--- + tools/pybind11NewTools.cmake | 7 ------- + tools/pybind11Tools.cmake | 6 ------ + 2 files changed, 13 deletions(-) + +diff --git a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake +index 7d7424a7..accd90c4 100644 +--- a/tools/pybind11NewTools.cmake ++++ b/tools/pybind11NewTools.cmake +@@ -233,13 +233,6 @@ function(pybind11_add_module target_name) + endif() + endif() + +- # Use case-insensitive comparison to match the result of $<CONFIG:cfgs> +- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) +- if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO) +- # Strip unnecessary sections of the binary on Linux/macOS +- pybind11_strip(${target_name}) +- endif() +- + if(MSVC) + target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) + endif() +diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake +index 66ad00a4..855ede41 100644 +--- a/tools/pybind11Tools.cmake ++++ b/tools/pybind11Tools.cmake +@@ -212,12 +212,6 @@ function(pybind11_add_module target_name) + endif() + endif() + +- # Use case-insensitive comparison to match the result of $<CONFIG:cfgs> +- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) +- if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO) +- pybind11_strip(${target_name}) +- endif() +- + if(MSVC) + target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) + endif() +-- +2.39.2 + 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 f94ef3637b..78662fe3cd 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 @@ -2,31 +2,33 @@ SUMMARY = "Seamless operability between C++11 and Python" HOMEPAGE = "https://github.com/pybind/pybind11" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=774f65abd8a7fe3124be2cdf766cd06f" +DEPENDS = "\ + python3-cmake-native \ + python3-ninja-native \ +" SRCREV = "8a099e44b3d5f85b20f05828d919d2332a8de841" -SRC_URI = "git://github.com/pybind/pybind11.git;branch=stable;protocol=https" +SRC_URI = "\ + git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ + file://0001-Do-not-strip-binaries.patch \ +" S = "${WORKDIR}/git" -inherit cmake setuptools3 +inherit cmake python_setuptools_build_meta EXTRA_OECMAKE = "-DPYBIND11_TEST=OFF" -PIP_INSTALL_DIST_PATH = "${S}/dist" -PIP_INSTALL_PACKAGE = "pybind11" - -do_configure() { - cmake_do_configure +do_configure:append() { + cmake_do_configure } -do_compile() { - setuptools3_do_compile - cmake_do_compile +do_compile:append() { + cmake_do_compile } -do_install() { - setuptools3_do_install - cmake_do_install +do_install:append() { + cmake_do_install } BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb index 219642849d..a38e10eec0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybluez_0.23.bb @@ -22,5 +22,5 @@ do_configure:prepend() { RDEPENDS:${PN} += "\ bluez5 \ - ${PYTHON_PN}-fcntl \ + python3-fcntl \ " 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 978fc0d4a6..b6b0de8809 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 @@ -12,11 +12,11 @@ PYPI_PACKAGE = "pycares" inherit pypi setuptools3 -DEPENDS += "${PYTHON_PN}-cffi-native" +DEPENDS += "python3-cffi-native" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-cffi \ - ${PYTHON_PN}-idna \ + python3-cffi \ + python3-idna \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_13.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_13.1.0.bb index 618aba4a67..30add4d2f1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_13.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pychromecast_13.1.0.bb @@ -10,11 +10,11 @@ PYPI_PACKAGE = "PyChromecast" inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-zeroconf \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-protobuf \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-casttube \ + python3-logging \ + python3-zeroconf \ + python3-json \ + python3-requests \ + python3-protobuf \ + python3-compression \ + python3-casttube \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc index 932cfc8522..dd2027948c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc @@ -2,24 +2,25 @@ # from Cargo.lock SRC_URI += " \ - crate://crates.io/ahash/0.8.6 \ + crate://crates.io/ahash/0.8.7 \ crate://crates.io/aho-corasick/1.0.2 \ + crate://crates.io/allocator-api2/0.2.16 \ crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/base64/0.21.5 \ + crate://crates.io/base64/0.21.7 \ crate://crates.io/bitflags/1.3.2 \ crate://crates.io/cc/1.0.79 \ crate://crates.io/cfg-if/1.0.0 \ crate://crates.io/enum_dispatch/0.3.12 \ crate://crates.io/equivalent/1.0.1 \ - crate://crates.io/form_urlencoded/1.2.0 \ + crate://crates.io/form_urlencoded/1.2.1 \ crate://crates.io/getrandom/0.2.10 \ - crate://crates.io/hashbrown/0.14.0 \ + crate://crates.io/hashbrown/0.14.3 \ crate://crates.io/heck/0.4.1 \ - crate://crates.io/idna/0.4.0 \ + crate://crates.io/idna/0.5.0 \ crate://crates.io/indexmap/2.0.0 \ crate://crates.io/indoc/2.0.4 \ crate://crates.io/itoa/1.0.8 \ - crate://crates.io/jiter/0.0.4 \ + crate://crates.io/jiter/0.0.6 \ crate://crates.io/lexical-core/0.8.5 \ crate://crates.io/lexical-parse-float/0.8.5 \ crate://crates.io/lexical-parse-integer/0.8.6 \ @@ -36,15 +37,16 @@ SRC_URI += " \ crate://crates.io/once_cell/1.18.0 \ crate://crates.io/parking_lot/0.12.1 \ crate://crates.io/parking_lot_core/0.9.8 \ - crate://crates.io/percent-encoding/2.3.0 \ - crate://crates.io/proc-macro2/1.0.69 \ - crate://crates.io/pyo3/0.20.0 \ - crate://crates.io/pyo3-build-config/0.20.0 \ - crate://crates.io/pyo3-ffi/0.20.0 \ - crate://crates.io/pyo3-macros/0.20.0 \ - crate://crates.io/pyo3-macros-backend/0.20.0 \ + crate://crates.io/percent-encoding/2.3.1 \ + crate://crates.io/portable-atomic/1.6.0 \ + crate://crates.io/proc-macro2/1.0.76 \ + crate://crates.io/pyo3/0.20.3 \ + crate://crates.io/pyo3-build-config/0.20.3 \ + crate://crates.io/pyo3-ffi/0.20.3 \ + crate://crates.io/pyo3-macros/0.20.3 \ + crate://crates.io/pyo3-macros-backend/0.20.3 \ crate://crates.io/python3-dll-a/0.2.9 \ - crate://crates.io/quote/1.0.29 \ + crate://crates.io/quote/1.0.35 \ crate://crates.io/redox_syscall/0.3.5 \ crate://crates.io/regex/1.10.2 \ crate://crates.io/regex-automata/0.4.3 \ @@ -52,15 +54,15 @@ SRC_URI += " \ crate://crates.io/rustversion/1.0.13 \ crate://crates.io/ryu/1.0.14 \ crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/serde/1.0.190 \ - crate://crates.io/serde_derive/1.0.190 \ - crate://crates.io/serde_json/1.0.108 \ - crate://crates.io/smallvec/1.11.1 \ + crate://crates.io/serde/1.0.195 \ + crate://crates.io/serde_derive/1.0.195 \ + crate://crates.io/serde_json/1.0.109 \ + crate://crates.io/smallvec/1.11.2 \ crate://crates.io/speedate/0.13.0 \ crate://crates.io/static_assertions/1.1.0 \ crate://crates.io/strum/0.25.0 \ crate://crates.io/strum_macros/0.25.3 \ - crate://crates.io/syn/2.0.38 \ + crate://crates.io/syn/2.0.48 \ crate://crates.io/target-lexicon/0.12.9 \ crate://crates.io/tinyvec/1.6.0 \ crate://crates.io/tinyvec_macros/0.1.1 \ @@ -68,8 +70,8 @@ SRC_URI += " \ crate://crates.io/unicode-ident/1.0.10 \ crate://crates.io/unicode-normalization/0.1.22 \ crate://crates.io/unindent/0.2.3 \ - crate://crates.io/url/2.4.1 \ - crate://crates.io/uuid/1.5.0 \ + crate://crates.io/url/2.5.0 \ + crate://crates.io/uuid/1.6.1 \ crate://crates.io/version_check/0.9.4 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ crate://crates.io/windows-targets/0.48.1 \ @@ -80,28 +82,29 @@ SRC_URI += " \ crate://crates.io/windows_x86_64_gnu/0.48.0 \ crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ crate://crates.io/windows_x86_64_msvc/0.48.0 \ - crate://crates.io/zerocopy/0.7.20 \ - crate://crates.io/zerocopy-derive/0.7.20 \ + crate://crates.io/zerocopy/0.7.32 \ + crate://crates.io/zerocopy-derive/0.7.32 \ " -SRC_URI[ahash-0.8.6.sha256sum] = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +SRC_URI[ahash-0.8.7.sha256sum] = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" SRC_URI[aho-corasick-1.0.2.sha256sum] = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -SRC_URI[base64-0.21.5.sha256sum] = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" SRC_URI[enum_dispatch-0.3.12.sha256sum] = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -SRC_URI[form_urlencoded-1.2.0.sha256sum] = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" SRC_URI[getrandom-0.2.10.sha256sum] = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -SRC_URI[hashbrown-0.14.0.sha256sum] = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -SRC_URI[idna-0.4.0.sha256sum] = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" SRC_URI[indexmap-2.0.0.sha256sum] = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" SRC_URI[itoa-1.0.8.sha256sum] = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" -SRC_URI[jiter-0.0.4.sha256sum] = "b27d419c535bf7b50ad355278b1159cbf0cc8d507ea003d625b17bf0375720b8" +SRC_URI[jiter-0.0.6.sha256sum] = "87db066a99f69382be06d02313f8ce989996b53a04a8a70cfd1a6483a56227f7" SRC_URI[lexical-core-0.8.5.sha256sum] = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" SRC_URI[lexical-parse-float-0.8.5.sha256sum] = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" SRC_URI[lexical-parse-integer-0.8.6.sha256sum] = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" @@ -118,15 +121,16 @@ SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77 SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" SRC_URI[parking_lot_core-0.9.8.sha256sum] = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -SRC_URI[percent-encoding-2.3.0.sha256sum] = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" -SRC_URI[proc-macro2-1.0.69.sha256sum] = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -SRC_URI[pyo3-0.20.0.sha256sum] = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" -SRC_URI[pyo3-build-config-0.20.0.sha256sum] = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" -SRC_URI[pyo3-ffi-0.20.0.sha256sum] = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" -SRC_URI[pyo3-macros-0.20.0.sha256sum] = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" -SRC_URI[pyo3-macros-backend-0.20.0.sha256sum] = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" +SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +SRC_URI[proc-macro2-1.0.76.sha256sum] = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" SRC_URI[python3-dll-a-0.2.9.sha256sum] = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" -SRC_URI[quote-1.0.29.sha256sum] = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" SRC_URI[regex-1.10.2.sha256sum] = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" SRC_URI[regex-automata-0.4.3.sha256sum] = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" @@ -134,15 +138,15 @@ SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f487 SRC_URI[rustversion-1.0.13.sha256sum] = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" SRC_URI[ryu-1.0.14.sha256sum] = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -SRC_URI[serde-1.0.190.sha256sum] = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" -SRC_URI[serde_derive-1.0.190.sha256sum] = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" -SRC_URI[serde_json-1.0.108.sha256sum] = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -SRC_URI[smallvec-1.11.1.sha256sum] = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +SRC_URI[serde-1.0.195.sha256sum] = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +SRC_URI[serde_derive-1.0.195.sha256sum] = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +SRC_URI[serde_json-1.0.109.sha256sum] = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +SRC_URI[smallvec-1.11.2.sha256sum] = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" SRC_URI[speedate-0.13.0.sha256sum] = "242f76c50fd18cbf098607090ade73a08d39cfd84ea835f3796a2c855223b19b" SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" SRC_URI[strum-0.25.0.sha256sum] = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" SRC_URI[strum_macros-0.25.3.sha256sum] = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -SRC_URI[syn-2.0.38.sha256sum] = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" SRC_URI[target-lexicon-0.12.9.sha256sum] = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" @@ -150,8 +154,8 @@ SRC_URI[unicode-bidi-0.3.13.sha256sum] = "92888ba5573ff080736b3648696b70cafad7d2 SRC_URI[unicode-ident-1.0.10.sha256sum] = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" -SRC_URI[url-2.4.1.sha256sum] = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -SRC_URI[uuid-1.5.0.sha256sum] = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +SRC_URI[uuid-1.6.1.sha256sum] = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" SRC_URI[windows-targets-0.48.1.sha256sum] = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" @@ -162,5 +166,5 @@ SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -SRC_URI[zerocopy-0.7.20.sha256sum] = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" -SRC_URI[zerocopy-derive-0.7.20.sha256sum] = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" +SRC_URI[zerocopy-0.7.32.sha256sum] = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +SRC_URI[zerocopy-derive-0.7.32.sha256sum] = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch new file mode 100644 index 0000000000..32777e1d03 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch @@ -0,0 +1,126 @@ +From a5690f973384bf8cbf4deb3b83d822b7aaefbdd8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 27 Feb 2024 11:00:46 -0800 +Subject: [PATCH] Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.20.2 to + 0.20.3. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Cargo.lock | 26 +++++++++++++++++--------- + Cargo.toml | 2 +- + 2 files changed, 18 insertions(+), 10 deletions(-) + +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -322,6 +322,12 @@ source = "registry+https://github.com/ru + checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + + [[package]] ++name = "portable-atomic" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" ++ ++[[package]] + name = "proc-macro2" + version = "1.0.76" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -357,9 +363,9 @@ dependencies = [ + + [[package]] + name = "pyo3" +-version = "0.20.2" ++version = "0.20.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" ++checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" + dependencies = [ + "cfg-if", + "indoc", +@@ -367,6 +373,7 @@ dependencies = [ + "memoffset", + "num-bigint", + "parking_lot", ++ "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", +@@ -375,9 +382,9 @@ dependencies = [ + + [[package]] + name = "pyo3-build-config" +-version = "0.20.2" ++version = "0.20.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" ++checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" + dependencies = [ + "once_cell", + "python3-dll-a", +@@ -386,9 +393,9 @@ dependencies = [ + + [[package]] + name = "pyo3-ffi" +-version = "0.20.2" ++version = "0.20.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" ++checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" + dependencies = [ + "libc", + "pyo3-build-config", +@@ -396,9 +403,9 @@ dependencies = [ + + [[package]] + name = "pyo3-macros" +-version = "0.20.2" ++version = "0.20.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" ++checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" + dependencies = [ + "proc-macro2", + "pyo3-macros-backend", +@@ -408,12 +415,13 @@ dependencies = [ + + [[package]] + name = "pyo3-macros-backend" +-version = "0.20.2" ++version = "0.20.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" ++checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" + dependencies = [ + "heck", + "proc-macro2", ++ "pyo3-build-config", + "quote", + "syn", + ] +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -26,7 +26,7 @@ include = [ + ] + + [dependencies] +-pyo3 = { version = "0.20.2", features = ["generate-import-lib", "num-bigint"] } ++pyo3 = { version = "0.20.3", features = ["generate-import-lib", "num-bigint"] } + regex = "1.10.2" + strum = { version = "0.25.0", features = ["derive"] } + strum_macros = "0.25.3" +@@ -70,12 +70,12 @@ debug = true + strip = false + + [dev-dependencies] +-pyo3 = { version = "0.20.2", features = ["auto-initialize"] } ++pyo3 = { version = "0.20.3", features = ["auto-initialize"] } + + [build-dependencies] + version_check = "0.9.4" + # used where logic has to be version/distribution specific, e.g. pypy +-pyo3-build-config = { version = "0.20.2" } ++pyo3-build-config = { version = "0.20.3" } + + [lints.clippy] + dbg_macro = "warn" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.14.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb index e58ee7fd66..b26478451a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.14.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb @@ -8,7 +8,8 @@ HOMEPAGE = "https://github.com/pydantic/pydantic-core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" -SRC_URI[sha256sum] = "1fd0c1d395372843fba13a51c28e3bb9d59bd7aebfeb17358ffaaa1e4dbbe948" +SRC_URI += "file://0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch" +SRC_URI[sha256sum] = "1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad" DEPENDS = "python3-maturin-native python3-typing-extensions" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.6.3.bb index 21341d26c3..246f67cb8f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.5.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.6.3.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6" inherit pypi python_hatchling -SRC_URI[sha256sum] = "b3ef57c62535b0941697cce638c08900d87fcb67e29cfa99e8a68f747f393f7a" +SRC_URI[sha256sum] = "e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f" DEPENDS += "python3-hatch-fancy-pypi-readme-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb index 5bbc33ade0..02ebeaad79 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfirmata_1.1.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84ddcef430b7c44caa22b2ff4b37a3df" PYPI_PACKAGE = "pyFirmata" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-pyserial \ + python3-pyserial \ " SRC_URI[md5sum] = "159673cfb56c72ceafc30fe91eedd847" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.1.0.bb index bfa4e0a699..eaa24eefe5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyhamcrest_2.1.0.bb @@ -7,12 +7,12 @@ SRC_URI[sha256sum] = "c6acbec0923d0cb7e72c22af1926f3e7c97b8e8d69fc7498eabacaf7c9 inherit pypi python_setuptools_build_meta -DEPENDS += "${PYTHON_PN}-hatch-vcs-native" +DEPENDS += "python3-hatch-vcs-native" UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/PyHamcrest/" UPSTREAM_CHECK_REGEX = "/PyHamcrest/(?P<pver>(\d+[\.\-_]*)+)" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-numbers \ + python3-six \ + python3-numbers \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymemcache_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymemcache_4.0.0.bb index 2a09e96949..8d966cfb63 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymemcache_4.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymemcache_4.0.0.bb @@ -11,12 +11,12 @@ SRC_URI[sha256sum] = "27bf9bd1bbc1e20f83633208620d56de50f14185055e49504f4f5e94e9 inherit pypi setuptools3 DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-six-native \ + python3-setuptools-scm-native \ + python3-six-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-logging \ + python3-io \ + python3-core \ + python3-logging \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymetno_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymetno_0.12.0.bb index ae686871e8..97985a8a1d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymetno_0.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymetno_0.12.0.bb @@ -12,7 +12,7 @@ inherit setuptools3 PIP_INSTALL_PACKAGE = "PyMetno" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-aiohttp (>=3.6.1) \ - ${PYTHON_PN}-async-timeout (>=3.0.1) \ - ${PYTHON_PN}-pytz (>=2019.3) \ + python3-aiohttp (>=3.6.1) \ + python3-async-timeout (>=3.0.1) \ + python3-pytz (>=2019.3) \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.184.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.185.bb index b0e62bae28..ce4671de93 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.184.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.185.bb @@ -3,20 +3,20 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[sha256sum] = "fbd9089c867a63144562932862474910696ab57f4786a4b7c1a0b28ba204c0ae" +SRC_URI[sha256sum] = "3ccdc6ee48d26d82c77ba3f5d8fd41a79eaaef0ad5619f37a65b060e92f6da4c" inherit python_poetry_core pypi PIP_INSTALL_PACKAGE = "pymisp" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-dateutil \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-jsonschema \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-deprecated \ - ${PYTHON_PN}-wrapt \ + python3-dateutil \ + python3-json \ + python3-jsonschema \ + python3-requests \ + python3-six \ + python3-deprecated \ + python3-wrapt \ " # Fixes: python3-pymisp requires /bin/bash, but no diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.6.4.bb index 337fd0e190..4f53d01f37 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.6.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/riptideio/pymodbus/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=eba8057aa82c058d2042b4b0a0e9cc63" -SRC_URI[sha256sum] = "862f64376ae201f979c91ca2398f0ed5df8f136b76491e0995edeebbd0fa8940" +SRC_URI[sha256sum] = "6eee2c7eedb794317784c967096fa1fe42200357e9b5a349d838ee9159624fe2" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.6.1.bb index 2704637d34..260e134cd2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.6.1.bb @@ -12,19 +12,19 @@ SRC_URI[sha256sum] = "31dab1f3e1d0cdd57e8df01b645f52d43cc1b653ed3afd535d2891f4fc inherit pypi setuptools3 -PACKAGES =+ "${PYTHON_PN}-bson" +PACKAGES =+ "python3-bson" -FILES:${PYTHON_PN}-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" +FILES:python3-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" -RDEPENDS:${PYTHON_PN}-bson += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-threading \ +RDEPENDS:python3-bson += " \ + python3-datetime \ + python3-json \ + python3-netclient \ + python3-numbers \ + python3-threading \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-bson \ - ${PYTHON_PN}-pprint \ + python3-bson \ + python3-pprint \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb index f797674e84..5e56a64aa1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymysql_1.1.0.bb @@ -16,4 +16,4 @@ inherit pypi python_setuptools_build_meta UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pymysql/" UPSTREAM_CHECK_REGEX = "/pymysql/(?P<pver>(\d+[\.\-_]*)+)" -RDEPENDS:${PN} += "${PYTHON_PN}-cryptography" +RDEPENDS:${PN} += "python3-cryptography" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb index 0747c67c19..a2f2ab4df4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb @@ -11,7 +11,7 @@ PYPI_PACKAGE = "PyNaCl" inherit pypi python_setuptools_build_meta DEPENDS += "\ - ${PYTHON_PN}-cffi-native \ + python3-cffi-native \ libsodium \ " @@ -24,8 +24,8 @@ do_install:prepend() { } RDEPENDS:${PN} = "\ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-cffi \ + python3-six \ + python3-cffi \ libsodium \ " @@ -34,3 +34,5 @@ RPROVIDES:${PN} = "python3-nacl" # in meta-virtualization layer # RCONFLICTS:${PN} = "python3-nacl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb index 2870ec9c01..dcf0015c59 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ctypes \ + python3-ctypes \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.6.2.bb index 3f284f2453..84c61ec8b0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperf_2.6.2.bb @@ -15,9 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=78bc2e6e87c8c61272937b879e6dc2f8" SRC_URI[sha256sum] = "64d8fadce6a74f478f29832c1eaa2a04856655ebff17292d5237fc8317c3a3c5" -DEPENDS += "${PYTHON_PN}-six-native" +DEPENDS += "python3-six-native" PYPI_PACKAGE = "pyperf" inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} += "${PYTHON_PN}-misc ${PYTHON_PN}-statistics" +RDEPENDS:${PN} += "python3-misc python3-statistics" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyppmd_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyppmd_1.1.0.bb index 053c9adab5..cec21007a2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyppmd_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyppmd_1.1.0.bb @@ -9,12 +9,12 @@ inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "1d38ce2e4b7eb84b53bc8a52380b94f66ba6c39328b8800b30c2b5bf31693973" DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-toml-native \ - ${PYTHON_PN}-wheel-native \ + python3-setuptools-scm-native \ + python3-toml-native \ + python3-wheel-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-email \ - ${PYTHON_PN}-importlib-metadata \ + python3-email \ + python3-importlib-metadata \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb index 739df2a1ba..aec19949d2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb @@ -14,10 +14,10 @@ BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling DEPENDS += "\ - ${PYTHON_PN}-hatch-vcs-native \ + python3-hatch-vcs-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-tomli \ + python3-packaging \ + python3-tomli \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb deleted file mode 100644 index 9887af78d0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-metadata_0.7.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "PEP 621 metadata parsing" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=310439af287b0fb4780b2ad6907c256c" - -PYPI_PACKAGE = "pyproject-metadata" - -inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN} += " \ - python3-logging \ - python3-packaging \ - python3-profile \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.54.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.54.bb index e8d75e9d75..6a484b8ae9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.54.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pysonos_0.0.54.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "2a72897cfd342382573632d80d38776884a38c8d02353d9d5da4e9e8e8 inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-ifaddr \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-xmltodict \ + python3-ifaddr \ + python3-requests \ + python3-xmltodict \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.13.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.13.2.bb index d31f45131f..3bfa20fcd9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.13.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pystemd_0.13.2.bb @@ -6,12 +6,12 @@ SRC_URI[sha256sum] = "4dcfa4b13a55685c49d3d17c10631eca18c33770f66316f8ef2337b895 DEPENDS = "systemd python3-cython-native" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-lxml \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-io \ + python3-xml \ + python3-lxml \ + python3-pprint \ + python3-core \ + python3-shell \ + python3-io \ " REQUIRED_DISTRO_FEATURES = "systemd" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.5.bb index 6def541872..2eda16f933 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-asyncio_0.23.5.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] = "2143d9d9375bf372a73260e4114541485e84fca350b0b6b92674ca56ff5f7ea2" +SRC_URI[sha256sum] = "3a048872a9c4ba14c3e90cc1aa20cbc2def7d01c7c8db3777ec281ba9c057675" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb index 66375dec35..0be97e5c4f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-cov_4.1.0.bb @@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6 inherit pypi setuptools3 -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "python3-coverage python3-pytest" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.12.29.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.12.29.bb index cf62e1f03b..6698b6dde3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.12.29.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-helpers-namespace_2021.12.29.bb @@ -11,5 +11,5 @@ inherit pypi python_setuptools_build_meta DEPENDS += "python3-setuptools-scm-native python3-setuptools-declarative-requirements-native" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb index b9023dfcde..37478ee0ae 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-html_4.1.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "pytest plugin for generating html reports from test results" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" @@ -11,11 +11,11 @@ PYPI_PACKAGE = "pytest_html" inherit pypi python_hatchling DEPENDS += "\ - ${PYTHON_PN}-hatch-vcs-native \ + python3-hatch-vcs-native \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-json-report_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-json-report_1.5.0.bb index 493c241df2..6b108a2d0a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-json-report_1.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-json-report_1.5.0.bb @@ -9,10 +9,10 @@ PYPI_PACKAGE = "pytest-json-report" inherit pypi setuptools3 -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} = "\ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-pytest-metadata \ + python3-pytest \ + python3-pytest-metadata \ " 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 deleted file mode 100644 index 8d2017d39c..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -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 deleted file mode 100644 index 9c50528fb0..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixture_0.6.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2022 Wind River Systems - -SUMMARY = "Use your fixtures in @pytest.mark.parametrize." -HOMEPAGE = "https://github.com/tvorog/pytest-lazy-fixture" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aae6f2b7c9b3ced83e0b5bb42346d4dd" - -SRC_URI[sha256sum] = "0e7d0c7f74ba33e6e80905e9bfd81f9d15ef9a790de97993e34213deb5ad10ac" - -SRC_URI += "file://run-ptest \ - " - - -inherit ptest pypi setuptools3 - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - - -RDEPENDS:${PN} += "python3-core python3-pytest" -RDEPENDS:${PN}-ptest = " \ - python3-unixadmin \ - python3-unittest-automake-output \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.5.bb new file mode 100644 index 0000000000..dcf662a2c8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.5.bb @@ -0,0 +1,21 @@ +SUMMARY = "Allows you to use fixtures in @pytest.mark.parametrize." +DESCRIPTION = "Use your fixtures in @pytest.mark.parametrize. \ +\ +This project was inspired by pytest-lazy-fixture.\ +\ +Improvements that have been made in this project:\ +\ +* You can use fixtures in any data structures\ +* You can access the attributes of fixtures\ +* You can use functions in fixtures" +HOMEPAGE = "https://github.com/dev-petrov/pytest-lazy-fixtures" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4475e66fcfabe27395e6764c8f69c876" + +SRC_URI[sha256sum] = "066b253a94c249e6d9cdfad465e2503d2219139fb468d8f687243dfde39ab9cb" + +inherit pypi python_poetry_core + +PYPI_PACKAGE = "pytest_lazy_fixtures" + +RDEPENDS:${PN} = "python3-pytest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb index e82213cbe5..163a363f82 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb @@ -1,5 +1,5 @@ DESCRIPTION = "pytest-metadata is a plugin that allowed for accessing pytest metadata" -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" @@ -11,7 +11,7 @@ PYPI_PACKAGE = "pytest-metadata" inherit pypi setuptools3 RDEPENDS:${PN} = " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb index 972c99e38f..dff6af4e0a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-tempdir_2019.10.12.bb @@ -10,5 +10,5 @@ SRC_URI[sha256sum] = "e7d91813a9aa991db87dacdef8cfd3f1657632d731d56d06238c5ffb63 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pytest \ + python3-pytest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.2.0.bb index da8bc5dd35..a7daa05e6c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.2.0.bb @@ -9,4 +9,4 @@ SRC_URI[sha256sum] = "3b0b95dabf3cb50bac9ef5ca912fa0cfc286526af17afc806824df20c2 inherit pypi setuptools3 -RDEPENDS:${PN} = "${PYTHON_PN}-pytest" +RDEPENDS:${PN} = "python3-pytest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb index c58981a327..5a2899e132 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyu2f_0.1.5.bb @@ -8,13 +8,13 @@ SRC_URI[sha256sum] = "a3caa3a11842fc7d5746376f37195e6af5f17c0a15737538bb1cebf656 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-six \ + python3-core \ + python3-crypt \ + python3-ctypes \ + python3-io \ + python3-json \ + python3-logging \ + python3-netclient \ + python3-threading \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb index 6fcf346bc4..ed5175fcf7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb @@ -13,10 +13,10 @@ do_configure:prepend() { } RDEPENDS:${PN} = "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-fcntl \ + python3-ctypes \ + python3-misc \ + python3-six \ + python3-threading \ + python3-fcntl \ libudev \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb index abe3529119..2282e0300b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyusb_1.2.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://pyusb.sourceforge.net/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=e64a29fcd3c3dd356a24e235dfcb3905" -DEPENDS += "libusb1 ${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "libusb1 python3-setuptools-scm-native" RDEPENDS:${PN} += " \ python3-logging \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb index 8b76397bfe..22868d8df0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.14.bb @@ -24,13 +24,13 @@ DEPENDS += " \ # Adding required python package for the ptest (pytest and pytest->automake report translation) RDEPENDS:${PN}-ptest += " \ - ${PYTHON_PN}-pytest \ - ${PYTHON_PN}-unittest-automake-output \ - ${PYTHON_PN}-pytz \ + python3-pytest \ + python3-unittest-automake-output \ + python3-pytz \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-core \ + python3-core \ " # Installing the test suite on the target diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rarfile_4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rarfile_4.1.bb index ece92ee3b3..8f5ef415c6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rarfile_4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rarfile_4.1.bb @@ -14,10 +14,10 @@ PYPI_PACKAGE="rarfile" RDEPENDS:${PN} += "\ p7zip \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-io \ + python3-core \ + python3-datetime \ + python3-crypt \ + python3-io \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.1.bb index e02ff7911e..8c2f891c1e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-oauthlib_1.3.1.bb @@ -5,4 +5,4 @@ SRC_URI[sha256sum] = "75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452c inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-requests ${PYTHON_PN}-oauthlib" +RDEPENDS:${PN} += "python3-requests python3-oauthlib" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rlp_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rlp_4.0.0.bb index 49efd09a4b..7df8ac07c5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rlp_4.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rlp_4.0.0.bb @@ -11,6 +11,6 @@ inherit pypi setuptools3 DEPENDS += "python3-pip-native" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-eth-utils \ - ${PYTHON_PN}-typing-extensions \ + python3-eth-utils \ + python3-typing-extensions \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb index 4c0bd7e3ec..0f34a1366d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework-seriallibrary_0.4.3.bb @@ -10,6 +10,6 @@ PYPI_PACKAGE = "robotframework-seriallibrary" inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-pyserial \ - ${PYTHON_PN}-robotframework \ + python3-pyserial \ + python3-robotframework \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb index ca301e46a4..beb71e6a18 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb @@ -16,15 +16,15 @@ PYPI_PACKAGE_EXT = "zip" SRC_URI[sha256sum] = "04623f758346c917db182e17591ffa474090560c02ed5a64343902e72b7b4bd5" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-pprint \ - ${PYTHON_PN}-xml \ - ${PYTHON_PN}-difflib \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-docutils \ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-profile \ + python3-shell \ + python3-pprint \ + python3-xml \ + python3-difflib \ + python3-threading \ + python3-html \ + python3-docutils \ + python3-ctypes \ + python3-logging \ + python3-numbers \ + python3-profile \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.9.bb index 0a1e359e14..c27cd1d68a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.9.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rsa_4.9.bb @@ -26,14 +26,14 @@ ALTERNATIVE_PRIORITY = "30" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-crypt \ - ${PYTHON_PN}-doctest \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-multiprocessing \ - ${PYTHON_PN}-netclient \ - ${PYTHON_PN}-pickle \ + python3-compression \ + python3-crypt \ + python3-doctest \ + python3-logging \ + python3-math \ + python3-multiprocessing \ + python3-netclient \ + python3-pickle \ " -RDEPENDS:${PN} += "${PYTHON_PN}-pyasn1" +RDEPENDS:${PN} += "python3-pyasn1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-schedule_1.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-schedule_1.2.1.bb index de326815ac..6ebde30e61 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-schedule_1.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-schedule_1.2.1.bb @@ -7,4 +7,4 @@ SRC_URI[sha256sum] = "843bc0538b99c93f02b8b50e3e39886c06f2d003b24f48e1aa4cadfa3f inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-datetime ${PYTHON_PN}-logging ${PYTHON_PN}-math" +RDEPENDS:${PN} += "python3-datetime python3-logging python3-math" 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 index 7f99dd16b8..dde0941ef1 100644 --- 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 @@ -2,7 +2,7 @@ SUMMARY = "Improved build system generator for Python C/C++/Fortran/Cython exten LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7c96d2b08b3cec6d3c67fb864d1fd8cc" -DEPENDS = "${PYTHON_PN}-hatch-vcs-native ${PYTHON_PN}-hatch-fancy-pypi-readme-native" +DEPENDS = "python3-hatch-vcs-native python3-hatch-fancy-pypi-readme-native" PYPI_PACKAGE = "scikit_build" @@ -11,11 +11,11 @@ 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 \ + python3-distro \ + python3-packaging \ + python3-setuptools \ + python3-typing-extensions \ + python3-wheel \ cmake \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb index 0fb3f3a228..19ac3f67f0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb @@ -11,6 +11,6 @@ SRC_URI[sha256sum] = "9983076bcc7e34402a1a9e4d7dabf3729411fd2abb3f3b4be7eba73519 inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-profile \ + python3-core \ + python3-profile \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sdbus_0.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdbus_0.11.1.bb index 6372d3488d..26bc71762e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sdbus_0.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sdbus_0.11.1.bb @@ -9,9 +9,9 @@ REQUIRED_DISTRO_FEATURES = "systemd" DEPENDS += "systemd" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-core \ + python3-asyncio \ + python3-numbers \ + python3-core \ " inherit pypi setuptools3 features_check pkgconfig diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.40.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.40.4.bb index ec59c712ba..f3f2a5d201 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.40.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sentry-sdk_1.40.4.bb @@ -6,16 +6,16 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=03dc788d9a9486be5e6a1d99c2c1ce3a" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-urllib3 \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-datetime \ + python3-urllib3 \ + python3-core \ + python3-json \ + python3-logging \ + python3-threading \ + python3-compression \ + python3-datetime \ " -SRC_URI[sha256sum] = "34ad8cfc9b877aaa2a8eb86bfe5296a467fffe0619b931a05b181c45f6da59bf" +SRC_URI[sha256sum] = "657abae98b0050a0316f0873d7149f951574ae6212f71d2e3a1c4c88f62d6456" PYPI_PACKAGE = "sentry-sdk" 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 0a2f2728b7..006fae290d 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 @@ -22,6 +22,7 @@ RDEPENDS:${PN} += " \ RDEPENDS:${PN}-ptest += " \ python3-pytest \ python3-unittest-automake-output \ + python3-pyopenssl \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_2.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_2.0.6.bb index 3a652a58be..cbe000e31c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_2.0.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sh_2.0.6.bb @@ -10,16 +10,16 @@ PYPI_PACKAGE = "sh" inherit pypi python_poetry_core RDEPENDS:${PN} += " \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-resource \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-terminal \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-fcntl \ + python3-asyncio \ + python3-codecs \ + python3-compression \ + python3-core \ + python3-io \ + python3-logging \ + python3-resource \ + python3-shell \ + python3-terminal \ + python3-threading \ + python3-unixadmin \ + python3-fcntl \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb index 91f6b35b32..cc5b1bc90a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb @@ -9,13 +9,13 @@ SRC_URI[sha256sum] = "9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24e inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ + python3-io \ + python3-netserver \ + python3-numbers \ " PACKAGES =+ "${PN}-tests" -RDEPENDS:${PN}-tests = "${PN} ${PYTHON_PN}-unittest" +RDEPENDS:${PN}-tests = "${PN} python3-unittest" FILES:${PN}-tests+= " \ ${PYTHON_SITEPACKAGES_DIR}/simplejson/tests \ ${PYTHON_SITEPACKAGES_DIR}/simplejson/tool.py* \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus_0.6.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus_0.6.5.bb index ae4e6f72da..7373b02f53 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus_0.6.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-slip-dbus_0.6.5.bb @@ -27,7 +27,7 @@ do_compile:prepend() { } RDEPENDS:${PN} += "\ - ${PYTHON_PN}-six \ + python3-six \ " # http://errors.yoctoproject.org/Errors/Details/184713/ # python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb index cc4802e6c7..b54cdb005f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb @@ -13,6 +13,6 @@ CLEANBROKEN = "1" PYPI_PACKAGE = "smbus2" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ + python3-ctypes \ + python3-fcntl \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.11.0.bb deleted file mode 100644 index 72471e956a..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.11.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Socket.IO server" -HOMEPAGE = "https://github.com/miguelgrinberg/python-socketio/" -SECTION = "devel/python" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" - -inherit pypi python_setuptools_build_meta - -PYPI_PACKAGE = "python-socketio" - -SRC_URI[sha256sum] = "b03186e04b942088781f6286c13604a853e5e35ed59158c51ff7af22fa032e6f" - -PACKAGECONFIG ?= "asyncio_client client" -PACKAGECONFIG[asyncio_client] = ",,,${PYTHON_PN}-aiohttp ${PYTHON_PN}-websockets" -PACKAGECONFIG[client] = ",,,${PYTHON_PN}-requests ${PYTHON_PN}-websocket-client" - -RDEPENDS:${PN} += "\ - ${PYTHON_PN}-engineio \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-pickle \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-threading \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-attrs \ - ${PYTHON_PN}-bidict \ - " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.11.1.bb new file mode 100644 index 0000000000..91feec98f8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-socketio_5.11.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "Socket.IO server" +HOMEPAGE = "https://github.com/miguelgrinberg/python-socketio/" +SECTION = "devel/python" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=42d0a9e728978f0eeb759c3be91536b8" + +inherit pypi python_setuptools_build_meta + +PYPI_PACKAGE = "python-socketio" + +SRC_URI[sha256sum] = "bbcbd758ed8c183775cb2853ba001361e2fa018babf5cbe11a5b77e91c2ec2a2" + +PACKAGECONFIG ?= "asyncio_client client" +PACKAGECONFIG[asyncio_client] = ",,,python3-aiohttp python3-websockets" +PACKAGECONFIG[client] = ",,,python3-requests python3-websocket-client" + +RDEPENDS:${PN} += "\ + python3-engineio \ + python3-logging \ + python3-math \ + python3-pickle \ + python3-json \ + python3-threading \ + python3-six \ + python3-attrs \ + python3-bidict \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_5.1.0.bb index d60d017d5b..ce71796339 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_5.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stevedore_5.1.0.bb @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI[sha256sum] = "a54534acf9b89bc7ed264807013b505bf07f74dbe4bcfa37d32bd063870b087c" -DEPENDS += "${PYTHON_PN}-pbr-native" +DEPENDS += "python3-pbr-native" inherit pypi setuptools3 -RDEPENDS:${PN} += "${PYTHON_PN}-pbr ${PYTHON_PN}-six" +RDEPENDS:${PN} += "python3-pbr python3-six" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb index 64e3671e1b..e119a0f11a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb @@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "f7f39c583fd92027bd9d06127b259aee7a5b7945c1f1fa56263811e1e7 inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-setuptools \ + python3-setuptools \ " BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file 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 index aa85189ee5..cbe7fcc215 100644 --- 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 @@ -5,7 +5,7 @@ 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" +DEPENDS = "python3-pytest-runner-native" SRC_URI[sha256sum] = "878fb5ab705442070e4dd1929bb5e2249511c0bcf2b0eeacf3bcd80875c82eff" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_235.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_235.bb index 01d42cd5a4..7a7d5a5053 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_235.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-systemd_235.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4fbd65380cdd255951079008b364516c" PYPI_PACKAGE = "systemd-python" DEPENDS += "systemd (<=235)" -RDEPENDS:${PN} += "systemd ${PYTHON_PN}-syslog ${PYTHON_PN}-logging python3-syslog" +RDEPENDS:${PN} += "systemd python3-syslog python3-logging python3-syslog" REQUIRED_DISTRO_FEATURES = "systemd" inherit pypi features_check pkgconfig setuptools3 SRC_URI:append:libc-musl = " file://0001-Provide-implementation-of-strndupa-for-musl.patch" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb index a25a1c66d5..75e97355f5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tabulate_0.9.0.bb @@ -8,14 +8,14 @@ SRC_URI[sha256sum] = "0095b12bf5966de529c0feb1fa08671671b3368eec77d7ef7ab114be2c inherit pypi python_setuptools_build_meta DEPENDS += " \ - ${PYTHON_PN}-setuptools-scm-native \ - ${PYTHON_PN}-toml-native \ + python3-setuptools-scm-native \ + python3-toml-native \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-html \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-math \ - ${PYTHON_PN}-profile \ + python3-html \ + python3-core \ + python3-io \ + python3-math \ + python3-profile \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb index c7e650d943..c1e7c8e1f7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-telnetlib3_2.0.4.bb @@ -11,5 +11,5 @@ PYPI_PACKAGE = "telnetlib3" inherit pypi setuptools3 RDEPENDS:${PN} = "\ - ${PYTHON_PN}-asyncio \ + python3-asyncio \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.5.bb index 3408b29c17..7d508ad809 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.5.bb @@ -8,5 +8,5 @@ SRC_URI[sha256sum] = "846fda941dbb8a7c9f246e99bf5ee731910fc4a4cc54b7e36457c133c9 inherit pypi setuptools3 RDEPENDS:${PN} = "\ - ${PYTHON_PN}-io \ + python3-io \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor_2.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor_2.4.0.bb index 212a293510..ea6b683991 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor_2.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-termcolor_2.4.0.bb @@ -9,8 +9,8 @@ inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "aab9e56047c8ac41ed798fa36d892a37aca6b3e9159f3e0c24bc64a9b3ac7b7a" DEPENDS += " \ - ${PYTHON_PN}-toml-native \ - ${PYTHON_PN}-hatch-vcs-native \ + python3-toml-native \ + python3-hatch-vcs-native \ " BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.13.0.bb index 6d092c6ffe..dd352e4848 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.12.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.13.0.bb @@ -6,29 +6,29 @@ HOMEPAGE = "http://tox.readthedocs.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" -SRC_URI[sha256sum] = "61aafbeff1bd8a5af84e54ef6e8402f53c6a6066d0782336171ddfbf5362122e" +SRC_URI[sha256sum] = "dd789a554c16c4b532924ba393c92fc8991323c4b3d466712bfecc8c9b9f24f7" BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling DEPENDS += "\ - ${PYTHON_PN}-hatch-vcs-native \ + python3-hatch-vcs-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-cachetools \ - ${PYTHON_PN}-chardet \ - ${PYTHON_PN}-colorama \ - ${PYTHON_PN}-filelock \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-platformdirs \ - ${PYTHON_PN}-pluggy \ - ${PYTHON_PN}-pyproject-api \ - ${PYTHON_PN}-tomli \ - ${PYTHON_PN}-virtualenv \ + python3-cachetools \ + python3-chardet \ + python3-colorama \ + python3-filelock \ + python3-packaging \ + python3-platformdirs \ + python3-pluggy \ + python3-pyproject-api \ + python3-tomli \ + python3-virtualenv \ " # Install all built-in python3 modules, as the software tested with tox might # depend on it. Tox will attempt to install all required dependencies # in a virtualenv using pip, but this obviously does not include the built-in modules. -RDEPENDS:${PN} += "${PYTHON_PN}-modules" +RDEPENDS:${PN} += "python3-modules" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.66.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.66.2.bb index 2a92e61893..77d26f54b2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.66.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.66.2.bb @@ -3,13 +3,13 @@ HOMEPAGE = "http://tqdm.github.io/" SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENCE;md5=bb3c087935ebba37cad180364cb0850c" +LIC_FILES_CHKSUM = "file://LICENCE;md5=42dfa9e8c616dbc295df3f58d756b2a1" -SRC_URI[sha256sum] = "d88e651f9db8d8551a62556d3cff9e3034274ca5d66e93197cf2490e2dcb69c7" +SRC_URI[sha256sum] = "6cd52cdf0fef0e0f543299cfc96fec90d7b8a7e88745f411ec33eb44d5ed3531" inherit pypi python_setuptools_build_meta -DEPENDS += "${PYTHON_PN}-setuptools-scm-native" +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += " \ python3-logging \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret-config_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret-config_2.0.2.bb index 5c5754740b..eee9ab88ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret-config_2.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret-config_2.0.2.bb @@ -8,8 +8,8 @@ SRC_URI[sha256sum] = "440b6b49e5e975f9a640a2519abb2feddd96eb2aeb1715f87f947a7a07 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-trafaret \ - ${PYTHON_PN}-pyyaml \ + python3-trafaret \ + python3-pyyaml \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb index 97c56abde4..5b24206a27 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-trafaret_2.1.1.bb @@ -8,9 +8,9 @@ SRC_URI[sha256sum] = "d9d00800318fbd343fdfb3353e947b2ebb5557159c844696c5ac24846f inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-urllib3 \ + python3-datetime \ + python3-numbers \ + python3-urllib3 \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.14.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.14.1.bb index 0089d6c6e1..e650906aa9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.14.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-traitlets_5.14.1.bb @@ -8,6 +8,6 @@ SRC_URI[sha256sum] = "8585105b371a04b8316a43d5ce29c098575c2e477850b62b848b964f14 inherit pypi python_hatchling RDEPENDS:${PN} = "\ - ${PYTHON_PN}-ipython-genutils \ - ${PYTHON_PN}-decorator \ + python3-ipython-genutils \ + python3-decorator \ " 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 ac03bce2b0..21161a0e0f 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,6 +20,7 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ + python3-pyopenssl \ python3-pyasn1-modules \ python3-pytest \ python3-service-identity \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_5.0.0.bb index 161b4b2212..cb45074811 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_4.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_5.0.0.bb @@ -3,16 +3,16 @@ HOMEPAGE = "https://twine.readthedocs.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" -SRC_URI[sha256sum] = "9e102ef5fdd5a20661eb88fad46338806c3bd32cf1db729603fe3697b1bc83c8" +SRC_URI[sha256sum] = "89b0cc7d370a4b66421cc6102f269aa910fe0f1861c124f573cf2ddedbc10cf4" inherit pypi python_setuptools_build_meta DEPENDS += "\ - ${PYTHON_PN}-setuptools-scm-native \ + python3-setuptools-scm-native \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-importlib-metadata \ + python3-importlib-metadata \ " BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb index 767ace114a..72a173e6f1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_22.10.0.bb @@ -39,7 +39,7 @@ PACKAGES =+ "\ " DEPENDS += " \ - ${PYTHON_PN}-incremental-native \ + python3-incremental-native \ " RDEPENDS:${PN} = "\ @@ -56,22 +56,22 @@ RDEPENDS:${PN} = "\ ${PN}-zsh \ " -RDEPENDS:${PN}-core = "${PYTHON_PN}-appdirs \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-automat \ - ${PYTHON_PN}-constantly \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-debugger \ - ${PYTHON_PN}-hyperlink \ - ${PYTHON_PN}-incremental \ - ${PYTHON_PN}-pyhamcrest \ - ${PYTHON_PN}-pyserial \ - ${PYTHON_PN}-typing-extensions \ - ${PYTHON_PN}-unixadmin \ - ${PYTHON_PN}-zopeinterface \ +RDEPENDS:${PN}-core = "python3-appdirs \ + python3-asyncio \ + python3-automat \ + python3-constantly \ + python3-core \ + python3-debugger \ + python3-hyperlink \ + python3-incremental \ + python3-pyhamcrest \ + python3-pyserial \ + python3-typing-extensions \ + python3-unixadmin \ + python3-zopeinterface \ " RDEPENDS:${PN}-test = "${PN}" -RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols ${PYTHON_PN}-bcrypt ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1 ${PYTHON_PN}-pickle" +RDEPENDS:${PN}-conch = "${PN}-core ${PN}-protocols python3-bcrypt python3-cryptography python3-pyasn1 python3-pickle" RDEPENDS:${PN}-mail = "${PN}-core ${PN}-protocols" RDEPENDS:${PN}-names = "${PN}-core" RDEPENDS:${PN}-news = "${PN}-core ${PN}-protocols" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_4.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_4.14.0.bb index 68908bb64e..23ea996258 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_4.14.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twitter_4.14.0.bb @@ -11,9 +11,9 @@ PYPI_PACKAGE = "tweepy" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-pip \ - ${PYTHON_PN}-pysocks \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-requests-oauthlib \ - ${PYTHON_PN}-six \ + python3-pip \ + python3-pysocks \ + python3-requests \ + python3-requests-oauthlib \ + python3-six \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb index 3b0562421b..b14e353818 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-txaio_23.1.1.bb @@ -8,5 +8,5 @@ SRC_URI[sha256sum] = "f9a9216e976e5e3246dfd112ad7ad55ca915606b60b84a757ac769bd40 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-twisted \ + python3-twisted \ " 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 000620ef73..1e9f6685db 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 @@ -21,6 +21,7 @@ RDEPENDS:${PN}-ptest += " \ python3-typing-extensions \ python3-unittest-automake-output \ python3-unixadmin \ + python3-mypy \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb index be1dab476c..8bfb8a6deb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-unoconv_0.9.0.bb @@ -11,9 +11,9 @@ inherit pypi setuptools3 PYPI_PACKAGE="unoconv" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-setuptools \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-shell \ + python3-setuptools \ + python3-core \ + python3-shell \ " do_install:append() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-virtualenv_20.25.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-virtualenv_20.25.0.bb index 0a9ba59452..1858fee25a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-virtualenv_20.25.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-virtualenv_20.25.0.bb @@ -12,11 +12,11 @@ BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling DEPENDS += "\ - ${PYTHON_PN}-hatch-vcs-native \ + python3-hatch-vcs-native \ " RDEPENDS:${PN} += " \ - ${PYTHON_PN}-distlib \ - ${PYTHON_PN}-filelock \ - ${PYTHON_PN}-platformdirs \ + python3-distlib \ + python3-filelock \ + python3-platformdirs \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_3.0.0.bb deleted file mode 100644 index bcd64892a2..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_3.0.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Filesystem events monitoring" -DEPENDS = "${PYTHON_PN}-argh" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -SRC_URI[sha256sum] = "4d98a320595da7a7c5a18fc48cb633c2e73cda78f93cac2ef42d42bf609a33f9" - -inherit pypi setuptools3 - -RDEPENDS:${PN} = " \ - ${PYTHON_PN}-argh \ - ${PYTHON_PN}-pathtools3 \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-requests \ -" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_4.0.0.bb new file mode 100644 index 0000000000..9e36264d62 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_4.0.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Filesystem events monitoring" +DEPENDS = "python3-argh" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRC_URI[sha256sum] = "e3e7065cbdabe6183ab82199d7a4f6b3ba0a438c5a512a68559846ccb76a78ec" + +inherit pypi setuptools3 + +RDEPENDS:${PN} = " \ + python3-argh \ + python3-pathtools3 \ + python3-pyyaml \ + python3-requests \ +" + +BBCLASSEXTEND = "native nativesdk" 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 index 00b19bb240..4eea0f0523 100644 --- 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 @@ -9,18 +9,18 @@ SRC_URI[sha256sum] = "f9e7eefc1b3c3d194868a4ef9583b625c18ea3f31a48ebe143183db748 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 \ + python3-aiohttp \ + python3-eth-abi \ + python3-eth-account \ + python3-eth-hash \ + python3-eth-typing \ + python3-eth-utils \ + python3-hexbytes \ + python3-jsonschema \ + python3-protobuf \ + python3-pydantic \ + python3-requests \ + python3-typing-extensions \ + python3-websockets \ + python3-pyunormalize \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb index ea830807c2..78af013320 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-webargs_8.4.0.bb @@ -8,10 +8,10 @@ inherit pypi setuptools3 SRC_URI[sha256sum] = "ea99368214a4ce613924be99d71db58c269631e95eff4fa09b7354e52dc006a5" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-marshmallow \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-core \ - ${PYTHON_PN}-json \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-logging \ + python3-marshmallow \ + python3-packaging \ + python3-core \ + python3-json \ + python3-asyncio \ + python3-logging \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb index ab33ce66e8..cedc790815 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-webencodings_0.5.1.bb @@ -8,8 +8,8 @@ SRC_URI[sha256sum] = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab1674858 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-codecs \ - ${PYTHON_PN}-json \ + python3-codecs \ + python3-json \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.7.0.bb index b202d68552..fc73f1b0a5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-websocket-client_1.7.0.bb @@ -12,6 +12,6 @@ SRC_URI[sha256sum] = "10e511ea3a8c744631d3bd77e61eb17ed09304c413ad42cf6ddfa4c778 inherit pypi setuptools3 RDEPENDS:${PN} = "\ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-logging \ + python3-six \ + python3-logging \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb index 0c3308d650..f8d2769b41 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb @@ -15,9 +15,9 @@ SRC_URI[sha256sum] = "507e811ecea72b18a404947aded4b3390e1db8f826b494d76550ef45bb inherit pypi python_flit_core RDEPENDS:${PN} += " \ - ${PYTHON_PN}-markupsafe \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-profile \ - ${PYTHON_PN}-compression \ - ${PYTHON_PN}-json \ + python3-markupsafe \ + python3-logging \ + python3-profile \ + python3-compression \ + python3-json \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb index f99b552c63..84c0528446 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb @@ -9,8 +9,8 @@ SRC_URI[sha256sum] = "5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06 inherit pypi setuptools3 RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-stringold \ - ${PYTHON_PN}-threading \ + python3-stringold \ + python3-threading \ " BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_3.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_3.1.2.bb index 1459538ea8..b3ba14ff7f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_3.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wtforms_3.1.2.bb @@ -13,12 +13,12 @@ UPSTREAM_CHECK_REGEX = "/WTForms/(?P<pver>(\d+[\.\-_]*)+)" inherit pypi python_hatchling DEPENDS += "\ - ${PYTHON_PN}-pip-native \ - ${PYTHON_PN}-babel-native \ + python3-pip-native \ + python3-babel-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-netserver \ - ${PYTHON_PN}-numbers \ - ${PYTHON_PN}-markupsafe \ + python3-netserver \ + python3-numbers \ + python3-markupsafe \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.0.1.bb index 890743b0c4..97dc683785 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.0.1.bb @@ -9,12 +9,12 @@ PYPI_PACKAGE = "xmlschema" inherit pypi setuptools3 DEPENDS += "\ - ${PYTHON_PN}-elementpath-native \ + python3-elementpath-native \ " RDEPENDS:${PN} += "\ - ${PYTHON_PN}-elementpath \ - ${PYTHON_PN}-modules \ + python3-elementpath \ + python3-modules \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb index 80fe945552..482f0c641b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb @@ -14,6 +14,6 @@ do_install:append() { } RDEPENDS:${PN} += " \ - ${PYTHON_PN}-logging \ + python3-logging \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_6.2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_6.2.1.1.bb index 254d9d035e..f4a51f318e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_6.2.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic-font-awesome_6.2.1.1.bb @@ -9,8 +9,8 @@ PYPI_PACKAGE = "XStatic-Font-Awesome" SRC_URI[sha256sum] = "f075871096128638f2e1539020d8227754c3d885dd68e7ee6de9a01235076828" DEPENDS += " \ - ${PYTHON_PN}-xstatic \ - ${PYTHON_PN}-pip \ + python3-xstatic \ + python3-pip \ " inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb index df4b7c8885..22bfa365ff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xstatic_1.0.3.bb @@ -9,7 +9,7 @@ PYPI_PACKAGE = "XStatic" SRC_URI[sha256sum] = "402544cc9e179489441054f09c807804e115ea246907de87c0355fb4f5a31268" DEPENDS += " \ - ${PYTHON_PN}-pip \ + python3-pip \ " inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.3.2.bb index 030ad8812a..93c58c11ca 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yamlloader_1.3.2.bb @@ -8,5 +8,5 @@ SRC_URI[sha256sum] = "7dbd98421d8090c521655f1b06ca030067f29df5253a8878126bce3a90 inherit pypi python_setuptools_build_meta RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-pyyaml \ + python3-pyyaml \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.131.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.131.0.bb index 1963d899b0..4c7bebe760 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.131.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.131.0.bb @@ -8,7 +8,7 @@ SRC_URI[sha256sum] = "90c431e99192a044a5e0217afd7ca0ca9824af93190332e6f7baf4da53 inherit pypi setuptools3 RDEPENDS:${PN} += " \ - ${PYTHON_PN}-ifaddr \ - ${PYTHON_PN}-asyncio \ - ${PYTHON_PN}-async-timeout \ + python3-ifaddr \ + python3-asyncio \ + python3-async-timeout \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_6.2.bb index 07e329a4a8..70a634a49b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zopeinterface_6.2.bb @@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e54fd776274c1b7423 PYPI_PACKAGE = "zope.interface" inherit pypi setuptools3 -SRC_URI[sha256sum] = "2fdc7ccbd6eb6b7df5353012fbed6c3c5d04ceaca0038f75e601060e95345309" +SRC_URI[sha256sum] = "3b6c62813c63c543a06394a636978b22dffa8c5410affc9331ce6cdb5bfa8565" PACKAGES =. "${PN}-test " RPROVIDES:${PN} += "zope-interfaces" -RDEPENDS:${PN}:class-target += "${PYTHON_PN}-datetime" +RDEPENDS:${PN}:class-target += "python3-datetime" RDEPENDS:${PN}-test += "python3-unittest python3-doctest" FILES:${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*.egg/*/*/.debug" 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.2.bb index 7854b7562c..18338df930 100644 --- 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.2.bb @@ -3,12 +3,12 @@ HOMEPAGE = "https://github.com/burnash/gspread" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9488e21983675fa56dc05af558b83e2f" -SRC_URI[sha256sum] = "8c8bf83be676a019d3a483455d8b17b442f2acfc620172f245422ca4fc960dd0" +SRC_URI[sha256sum] = "0982beeb07fa3ec4482a3aaa96ca13a1e6b427a0aca4058beab4cdc33c0cbb64" RDEPENDS:${PN} = " \ - ${PYTHON_PN}-google-auth \ - ${PYTHON_PN}-google-auth-oauthlib \ - ${PYTHON_PN}-strenum \ + python3-google-auth \ + python3-google-auth-oauthlib \ + python3-strenum \ " inherit pypi python_flit_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python3_oauth2client/python3-oauth2client_4.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python3_oauth2client/python3-oauth2client_4.1.3.bb index c0b111838c..d87e289c5f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python3_oauth2client/python3-oauth2client_4.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python3_oauth2client/python3-oauth2client_4.1.3.bb @@ -9,11 +9,11 @@ inherit pypi SRC_URI[sha256sum] = "d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-httplib2 \ - ${PYTHON_PN}-pyasn1 \ - ${PYTHON_PN}-pyasn1-modules \ - ${PYTHON_PN}-rsa \ - ${PYTHON_PN}-six \ + python3-httplib2 \ + python3-pyasn1 \ + python3-pyasn1-modules \ + python3-rsa \ + python3-six \ " inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb index 0478d0d5c2..8c9262afb8 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pyephem/python3-pyephem_4.1.5.bb @@ -11,6 +11,6 @@ PYPI_PACKAGE = "ephem" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-datetime \ - ${PYTHON_PN}-math \ + python3-datetime \ + python3-math \ " diff --git a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.7.0.bb b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.7.0.bb index 5a1d5ddb8f..959f0d51aa 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.7.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.7.0.bb @@ -12,4 +12,4 @@ SRC_URI[sha256sum] = "5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf inherit pypi python_poetry_core -RDEPENDS:${PN} = "${PYTHON_PN}-pygments" +RDEPENDS:${PN} = "python3-pygments" diff --git a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.8.2.bb b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.8.2.bb index e18aa83df2..69578ba84f 100644 --- a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.8.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.8.2.bb @@ -13,6 +13,6 @@ inherit pypi python_setuptools_build_meta BBCLASSEXTEND = "native nativesdk" RDEPENDS:${PN} += " \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-logging \ + python3-fcntl \ + python3-logging \ " diff --git a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.2.0.bb b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.2.0.bb index ab631b256f..89c05c2a68 100644 --- a/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-extended/pywbemtools/python3-pywbemtools_1.2.0.bb @@ -9,24 +9,24 @@ SRC_URI[sha256sum] = "921fb57ea2ae3ae2806e18895bb0457697f27221b345c8b05afa4cb304 inherit pypi setuptools3 RDEPENDS:${PN}:class-target += "\ - ${PYTHON_PN}-ply \ - ${PYTHON_PN}-pyyaml \ - ${PYTHON_PN}-six \ - ${PYTHON_PN}-pywbem \ - ${PYTHON_PN}-click \ - ${PYTHON_PN}-requests \ - ${PYTHON_PN}-prompt-toolkit \ - ${PYTHON_PN}-mock \ - ${PYTHON_PN}-packaging \ - ${PYTHON_PN}-nocasedict \ - ${PYTHON_PN}-yamlloader \ - ${PYTHON_PN}-click-repl \ - ${PYTHON_PN}-click-spinner \ - ${PYTHON_PN}-asciitree \ - ${PYTHON_PN}-tabulate \ - ${PYTHON_PN}-pydicti \ - ${PYTHON_PN}-nocaselist \ - ${PYTHON_PN}-custom-inherit \ + python3-ply \ + python3-pyyaml \ + python3-six \ + python3-pywbem \ + python3-click \ + python3-requests \ + python3-prompt-toolkit \ + python3-mock \ + python3-packaging \ + python3-nocasedict \ + python3-yamlloader \ + python3-click-repl \ + python3-click-spinner \ + python3-asciitree \ + python3-tabulate \ + python3-pydicti \ + python3-nocaselist \ + python3-custom-inherit \ " BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.43.2.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb index 28e82dac31..700c6b2346 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.43.2.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb @@ -5,17 +5,15 @@ HOMEPAGE = "https://github.com/netdata/netdata/" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -DEPENDS += "libuv util-linux zlib libyaml json-c" +DEPENDS += "json-c libuv libyaml util-linux zlib " -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ +SRC_URI = "\ + https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ + file://netdata.conf \ + file://netdata.service \ " -SRC_URI[sha256sum] = "d4a7ea2717ac7c8f04865f18e13aeaa0a36784156059f1b5ced75a44f74afc4d" -# default netdata.conf for netdata configuration -SRC_URI += "file://netdata.conf" - -# file for providing systemd service support -SRC_URI += "file://netdata.service" +SRC_URI[sha256sum] = "50df30a9aaf60d550eb8e607230d982827e04194f7df3eba0e83ff7919270ad2" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags" UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" |