Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from buildroot:master #440

Merged
merged 23 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1da57d0
package/uuu: bump to version 1.5.201
passgat Jan 14, 2025
fb032bd
package/zxing-cpp: bump to version 2.3.0
Taumille Jan 12, 2025
055f82e
support/testing: new xen runtime test
vstehle Jan 13, 2025
780e140
package/python-betterproto: disable dependency check
jameshilliard Jan 14, 2025
4a95976
package/zfs: bump version to 2.3.0
jlsalvador Jan 14, 2025
bbdcb75
package/python-pyopenssl: bump to version 25.0.0
jameshilliard Jan 13, 2025
8b2e0c8
package/python-poetry-core: bump to version 2.0.1
jameshilliard Jan 13, 2025
d064554
package/python-marshmallow: bump to version 3.25.1
jameshilliard Jan 13, 2025
5e3f701
package/python-marshmallow-sqlalchemy: bump to version 1.3.0
jameshilliard Jan 13, 2025
521d6b8
package/python-grpcio: bump to version 1.69.0
jameshilliard Jan 13, 2025
460c5fe
package/python-grpcio-reflection: bump to version 1.69.0
jameshilliard Jan 13, 2025
1c74faf
package/python-botocore: bump to version 1.35.97
jameshilliard Jan 13, 2025
92ec676
package/python-boto3: bump to version 1.35.97
jameshilliard Jan 13, 2025
203abef
toolchain/toolchain-external/toolchain-external-arm-arm: fix BR2_ARCH…
RomainNaour Jan 13, 2025
2999677
toolchain/toolchain-external/toolchain-external-arm-aarch64: fix BR2_…
RomainNaour Jan 13, 2025
7ffc6ae
toolchain/toolchain-external/toolchain-external-arm-aarch64-be: fix B…
RomainNaour Jan 13, 2025
cfe6907
toolchain/toolchain-external/toolchain-external-arm-arm: bump to 14.2…
RomainNaour Jan 13, 2025
e5a965a
toolchain/toolchain-external/toolchain-external-arm-aarch64: bump to …
RomainNaour Jan 13, 2025
012f03b
toolchain/toolchain-external/toolchain-external-arm-aarch64-be: bump …
RomainNaour Jan 13, 2025
2528672
package/cross-ldd: new package
tpetazzoni Jan 8, 2025
b171b7b
package/dracut: use host-cross-ldd instead of host-prelink-cross
tpetazzoni Jan 8, 2025
2eba7b1
package/prelink-cross: remove package
tpetazzoni Jan 8, 2025
9347328
package/libiberty: remove package
tpetazzoni Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .checkpackageignore
Original file line number Diff line number Diff line change
Expand Up @@ -996,7 +996,6 @@ package/pptp-linux/0001-susv3-legacy.patch lib_patch.Upstream
package/pptp-linux/0002-fix-parallel-build.patch lib_patch.Upstream
package/prboom/0001-libpng-1.4.patch lib_patch.Upstream
package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch lib_patch.Upstream
package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch lib_patch.Upstream
package/procps-ng/S02sysctl lib_sysv.Variables
package/proftpd/S50proftpd Shellcheck lib_sysv.Indent lib_sysv.Variables
package/prosody/0001-enable-syslog.patch lib_patch.Upstream
Expand Down
3 changes: 3 additions & 0 deletions DEVELOPERS
Original file line number Diff line number Diff line change
Expand Up @@ -3145,6 +3145,7 @@ F: package/cifs-utils/
F: package/cloop/
F: package/cmake/
F: package/cramfs/
F: package/cross-ldd/
F: package/dmidecode/
F: package/double-conversion/
F: package/flashrom/
Expand Down Expand Up @@ -3294,6 +3295,8 @@ F: package/pixz/
F: package/zerofree/
F: support/testing/tests/package/test_msr_tools*
F: support/testing/tests/package/test_pixz.py
F: support/testing/tests/package/test_xen.py
F: support/testing/tests/package/test_xen/
F: support/testing/tests/package/test_zerofree.py

N: Vinicius Tinti <[email protected]>
Expand Down
4 changes: 4 additions & 0 deletions package/cross-ldd/cross-ldd.hash
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# From http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.26.0.tar.xz.sha512
sha512 7834184ae5792fd347455f9f48fee826248dcb82d271954ed4304b1a18f63995ff8a2c3b817564dcf147ac7e16e02d779195b26d97eb57db27f1118a1837002a crosstool-ng-1.26.0.tar.xz
# Locally calculated
sha256 07bc0ccd386469c748c4cf6c8faca5667fbf8c4400386714287fa233acfd68ba COPYING
37 changes: 37 additions & 0 deletions package/cross-ldd/cross-ldd.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
################################################################################
#
# cross-ldd
#
################################################################################

CROSS_LDD_VERSION = 1.26.0
CROSS_LDD_SITE = http://crosstool-ng.org/download/crosstool-ng
CROSS_LDD_SOURCE = crosstool-ng-$(CROSS_LDD_VERSION).tar.xz
CROSS_LDD_LICENSE = GPL-2.0
CROSS_LDD_LICENSE_FILES = COPYING

ifeq ($(BR2_ARCH_IS_64),y)
CROSS_LDD_BITNESS = 64
else
CROSS_LDD_BITNESS = 32
endif

CROSS_LDD_TOOLS_PREFIX = $(patsubst %-,%,$(TARGET_CROSS))

define HOST_CROSS_LDD_CONFIGURE_CMDS
sed \
-e "s%@@CT_bash@@%/usr/bin/env bash%" \
-e "s%@@CT_VERSION@@%$(CROSS_LDD_VERSION)%" \
-e "s%@@CT_BITS@@%$(CROSS_LDD_BITNESS)%" \
-e "s%@@CT_sed@@%sed%" \
-e "s%@@CT_grep@@%grep%" \
-e "s%^prefix=.*%prefix=$(CROSS_LDD_TOOLS_PREFIX)%" \
$(@D)/scripts/xldd.in > \
$(@D)/scripts/xldd
endef

define HOST_CROSS_LDD_INSTALL_CMDS
$(INSTALL) -m 0755 -D $(@D)/scripts/xldd $(TARGET_CROSS)xldd
endef

$(eval $(host-generic-package))
8 changes: 5 additions & 3 deletions package/dracut/dracut.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ DRACUT_LICENSE = GPL-2.0
DRACUT_LICENSE_FILES = COPYING
DRACUT_CPE_ID_VALID = YES

HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross
HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd

define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT
mv $(HOST_DIR)/bin/dracut $(HOST_DIR)/bin/dracut.real
install -D -m 0755 $(HOST_DRACUT_PKGDIR)/dracut_wrapper \
$(HOST_DIR)/bin/dracut
sed -e "s%@@TARGET_CROSS@@%$(TARGET_CROSS)%" \
$(HOST_DRACUT_PKGDIR)/dracut_wrapper.in > \
$(@D)/dracut_wrapper
install -D -m 0755 $(@D)/dracut_wrapper $(HOST_DIR)/bin/dracut
endef
HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ topdir="$(dirname "$(realpath "$(dirname "${0}")")")"
DRACUT_LDD="$(mktemp /tmp/dracut-ldd.XXXXXX)"
cat >"${DRACUT_LDD}" <<EOL
#!/bin/bash
${topdir}/sbin/prelink-rtld --root='${sysroot}' \${1}
@@TARGET_CROSS@@xldd --root='${sysroot}' \${1}
EOL
chmod +x "${DRACUT_LDD}"
export DRACUT_LDD
Expand Down
4 changes: 1 addition & 3 deletions package/gdb/gdb.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ GDB_PRE_CONFIGURE_HOOKS += GDB_CONFIGURE_SYMLINK
# For the host variant, we really want to build with XML support,
# which is needed to read XML descriptions of target architectures. We
# also need ncurses.
# As for libiberty, gdb may use a system-installed one if present, so
# we must ensure ours is installed first.
HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses host-zlib
HOST_GDB_DEPENDENCIES = host-expat host-ncurses host-zlib

# Disable building documentation
GDB_MAKE_OPTS += MAKEINFO=true
Expand Down
1 change: 0 additions & 1 deletion package/libiberty/libiberty.hash

This file was deleted.

32 changes: 0 additions & 32 deletions package/libiberty/libiberty.mk

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions package/prelink-cross/prelink-cross.hash

This file was deleted.

16 changes: 0 additions & 16 deletions package/prelink-cross/prelink-cross.mk

This file was deleted.

1 change: 1 addition & 0 deletions package/python-betterproto/python-betterproto.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ PYTHON_BETTERPROTO_SITE = https://files.pythonhosted.org/packages/4e/94/930a1368
PYTHON_BETTERPROTO_SETUP_TYPE = poetry
PYTHON_BETTERPROTO_LICENSE = MIT
PYTHON_BETTERPROTO_LICENSE_FILES = LICENSE.md
PYTHON_BETTERPROTO_BUILD_OPTS = --skip-dependency-check

$(eval $(python-package))
4 changes: 2 additions & 2 deletions package/python-boto3/python-boto3.hash
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/boto3/json
md5 5f616b5314958f132a674ee7e68608f2 boto3-1.35.86.tar.gz
sha256 d61476fdd5a5388503b72c897083310d2329ce088593c4332b571a860be5d155 boto3-1.35.86.tar.gz
md5 07aaafa117a4a0ed4025296a85018276 boto3-1.35.97.tar.gz
sha256 7d398f66a11e67777c189d1f58c0a75d9d60f98d0ee51b8817e828930bf19e4e boto3-1.35.97.tar.gz
# Locally computed sha256 checksums
sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE
4 changes: 2 additions & 2 deletions package/python-boto3/python-boto3.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
################################################################################

PYTHON_BOTO3_VERSION = 1.35.86
PYTHON_BOTO3_VERSION = 1.35.97
PYTHON_BOTO3_SOURCE = boto3-$(PYTHON_BOTO3_VERSION).tar.gz
PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/b7/23/0fe81184d4c3c4f640288dce790c705a76263c1aa688f684ef1dbe9d4f7d
PYTHON_BOTO3_SITE = https://files.pythonhosted.org/packages/b0/0b/be51ba3bf22832bc918b4059ca182877681b02a45627c51d70efbbf1991d
PYTHON_BOTO3_SETUP_TYPE = setuptools
PYTHON_BOTO3_LICENSE = Apache-2.0
PYTHON_BOTO3_LICENSE_FILES = LICENSE
Expand Down
4 changes: 2 additions & 2 deletions package/python-botocore/python-botocore.hash
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/botocore/json
md5 32354bfad0d8ad0fde84143f2f2edaf8 botocore-1.35.86.tar.gz
sha256 951e944eb30284b4593d4da98f70f7b5292ea237e4de0c5a2852946a549b8347 botocore-1.35.86.tar.gz
md5 4e9617831cbc77e09203474718b40a2d botocore-1.35.97.tar.gz
sha256 88f2fab29192ffe2f2115d5bafbbd823ff4b6eb2774296e03ec8b5b0fe074f61 botocore-1.35.97.tar.gz
# Locally computed sha256 checksums
sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE.txt
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 tests/unit/auth/aws4_testsuite/LICENSE
4 changes: 2 additions & 2 deletions package/python-botocore/python-botocore.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
################################################################################

PYTHON_BOTOCORE_VERSION = 1.35.86
PYTHON_BOTOCORE_VERSION = 1.35.97
PYTHON_BOTOCORE_SOURCE = botocore-$(PYTHON_BOTOCORE_VERSION).tar.gz
PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/14/ed/f639350bfa1c1f898dbbf69250c961ded22ebf7bedc02fa23127c7762d78
PYTHON_BOTOCORE_SITE = https://files.pythonhosted.org/packages/48/cd/79656501384e265c9b3099358da2ec6a18568ddf44e5dd61582692a3e7b3
PYTHON_BOTOCORE_SETUP_TYPE = setuptools
PYTHON_BOTOCORE_LICENSE = Apache-2.0
PYTHON_BOTOCORE_LICENSE_FILES = LICENSE.txt tests/unit/auth/aws4_testsuite/LICENSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/grpcio-reflection/json
md5 e9a0f06f8886b5f95da4e599b0960ef5 grpcio_reflection-1.67.1.tar.gz
sha256 507d9785a72032816e9bb5add4a660c655813a6bc1537b957822c652c88bf458 grpcio_reflection-1.67.1.tar.gz
md5 f1b2d22885a2a70fbcc499211059e2be grpcio_reflection-1.69.0.tar.gz
sha256 3474aaedfb10d8da5503135a2fb9fbb4e1f72044ad7ee2d0bf22090934e80908 grpcio_reflection-1.69.0.tar.gz
# Locally computed sha256 checksums
sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE
4 changes: 2 additions & 2 deletions package/python-grpcio-reflection/python-grpcio-reflection.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
################################################################################

PYTHON_GRPCIO_REFLECTION_VERSION = 1.67.1
PYTHON_GRPCIO_REFLECTION_VERSION = 1.69.0
PYTHON_GRPCIO_REFLECTION_SOURCE = grpcio_reflection-$(PYTHON_GRPCIO_REFLECTION_VERSION).tar.gz
PYTHON_GRPCIO_REFLECTION_SITE = https://files.pythonhosted.org/packages/17/61/618d56bd1f7069dea5fee8fa6efb5e6548b6edb52000ef1a7b242c0c1b04
PYTHON_GRPCIO_REFLECTION_SITE = https://files.pythonhosted.org/packages/bd/88/064538adae2e526f4626ad57f53a99fca5ae5013e627214093ef1d47cc35
PYTHON_GRPCIO_REFLECTION_SETUP_TYPE = setuptools
PYTHON_GRPCIO_REFLECTION_LICENSE = Apache-2.0
PYTHON_GRPCIO_REFLECTION_LICENSE_FILES = LICENSE
Expand Down
4 changes: 2 additions & 2 deletions package/python-grpcio/python-grpcio.hash
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/grpcio/json
md5 f1e17b3bf215880d87fb8d853bd5dc4c grpcio-1.67.1.tar.gz
sha256 3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732 grpcio-1.67.1.tar.gz
md5 397e8c15a8b474e664225927a7a5fff6 grpcio-1.69.0.tar.gz
sha256 936fa44241b5379c5afc344e1260d467bee495747eaf478de825bab2791da6f5 grpcio-1.69.0.tar.gz
# Locally computed sha256 checksums
sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE
4 changes: 2 additions & 2 deletions package/python-grpcio/python-grpcio.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
################################################################################

PYTHON_GRPCIO_VERSION = 1.67.1
PYTHON_GRPCIO_VERSION = 1.69.0
PYTHON_GRPCIO_SOURCE = grpcio-$(PYTHON_GRPCIO_VERSION).tar.gz
PYTHON_GRPCIO_SITE = https://files.pythonhosted.org/packages/20/53/d9282a66a5db45981499190b77790570617a604a38f3d103d0400974aeb5
PYTHON_GRPCIO_SITE = https://files.pythonhosted.org/packages/e4/87/06a145284cbe86c91ca517fe6b57be5efbb733c0d6374b407f0992054d18
PYTHON_GRPCIO_SETUP_TYPE = setuptools
PYTHON_GRPCIO_LICENSE = Apache-2.0
PYTHON_GRPCIO_LICENSE_FILES = LICENSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/marshmallow-sqlalchemy/json
md5 da3500ba7a5c4eb499c3564748d76ccf marshmallow_sqlalchemy-1.2.0.tar.gz
sha256 9787e95d52dc39f351db1ca47a7ca30b593e4f02b5c54592680bc03ce8ce0e79 marshmallow_sqlalchemy-1.2.0.tar.gz
md5 355535b775773755337059a1a990a0dc marshmallow_sqlalchemy-1.3.0.tar.gz
sha256 5ddf583dd75fdf5ab31df76987cda2ba91942996ba5d577e92d6748fa93a5f52 marshmallow_sqlalchemy-1.3.0.tar.gz
# Locally computed sha256 checksums
sha256 906b5d9051e426144cb173ad911667b8ebd05a9c584c2c26c135b32a3ed12001 LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
################################################################################

PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 1.2.0
PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION = 1.3.0
PYTHON_MARSHMALLOW_SQLALCHEMY_SOURCE = marshmallow_sqlalchemy-$(PYTHON_MARSHMALLOW_SQLALCHEMY_VERSION).tar.gz
PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/9f/a7/5ee9c0073c34a2141d4ae5e90a6c131bc859c6f7b3367ba55c6910d48f3b
PYTHON_MARSHMALLOW_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/2c/6f/38843dc27666b2c802edc256c1981a34d1c28e898f3503ab5ea89c10f138
PYTHON_MARSHMALLOW_SQLALCHEMY_SETUP_TYPE = flit
PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE = MIT
PYTHON_MARSHMALLOW_SQLALCHEMY_LICENSE_FILES = LICENSE
Expand Down
4 changes: 2 additions & 2 deletions package/python-marshmallow/python-marshmallow.hash
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/marshmallow/json
md5 881654a8819a7f8ae8f91563cf378b7d marshmallow-3.25.0.tar.gz
sha256 5ba94a4eb68894ad6761a505eb225daf7e5cb7b4c32af62d4a45e9d42665bc31 marshmallow-3.25.0.tar.gz
md5 0714da7f00520766aeb55fedc384b7e2 marshmallow-3.25.1.tar.gz
sha256 f4debda3bb11153d81ac34b0d582bf23053055ee11e791b54b4b35493468040a marshmallow-3.25.1.tar.gz
# Locally computed sha256 checksums
sha256 906b5d9051e426144cb173ad911667b8ebd05a9c584c2c26c135b32a3ed12001 LICENSE
sha256 f982e6fd97ba00973e94605b972ff04894b22c4fa937b868828b32ae8f0a7c2e docs/license.rst
4 changes: 2 additions & 2 deletions package/python-marshmallow/python-marshmallow.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
################################################################################

PYTHON_MARSHMALLOW_VERSION = 3.25.0
PYTHON_MARSHMALLOW_VERSION = 3.25.1
PYTHON_MARSHMALLOW_SOURCE = marshmallow-$(PYTHON_MARSHMALLOW_VERSION).tar.gz
PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/bd/5c/cbfa41491d6c83b36471f2a2f75602349d20a8f88afd94f83c1e68bbc298
PYTHON_MARSHMALLOW_SITE = https://files.pythonhosted.org/packages/b8/85/43b8e95251312e8d0d3389263e87e368a5a015db475e140d5dd8cb8dcb47
PYTHON_MARSHMALLOW_SETUP_TYPE = flit
PYTHON_MARSHMALLOW_LICENSE = MIT
PYTHON_MARSHMALLOW_LICENSE_FILES = LICENSE docs/license.rst
Expand Down
4 changes: 2 additions & 2 deletions package/python-poetry-core/python-poetry-core.hash
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/poetry-core/json
md5 4e538b8fd6f05bd3be0a29c90d9cfb0b poetry_core-2.0.0.tar.gz
sha256 3317a3cc3932011a61114236b2d49883f4fb1403d2f5e97771ac0d077cfa396f poetry_core-2.0.0.tar.gz
md5 799f582e2644e6c2c7865498f3b37394 poetry_core-2.0.1.tar.gz
sha256 10177c2772469d9032a49f0d8707af761b1c597cea3b4fb31546e5cd436eb157 poetry_core-2.0.1.tar.gz
# Locally computed sha256 checksums
sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE
Loading