support/testing: test_docker_compose: bump the kernel to 4.19.204
PATCH 1/2 support/testing: test_docker_compose: bump the kernel to 4.19.204
gcc 10.x is now used by default but the kernel 4.19 used by test_docker_compose doesn't build with it.
Bump the kernel to 4.19.204 release that contains a lot of fixes for newer gcc.
--- support/testing/tests/package/test_docker_compose.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
support/testing/tests/package/test_docker_compose.py +1 -1
@@ -16,7 +16,7 @@ class TestDockerCompose(infra.basetest.BRTest): BR2_ROOTFS_POST_SCRIPT_ARGS="{}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.204" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" BR2_PACKAGE_CA_CERTIFICATES=y
Signature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
PATCH 2/2 package/python{3}-requests: allow idna 3.x to be installed on python 3.x
The tests.package.test_docker_compose.TestDockerCompose is broken since the python-idna version bump to 3.0 because python-requests needs python-idna < 3.0.
# docker-compose up -d
Traceback (most recent call last):
File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 583, in _build_master
File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 900, in require
File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 791, in resolve
pkg_resources.ContextualVersionConflict: (idna 3.2 (/usr/lib/python3.9/site-packages), Requirement.parse('idna<3,>=2.5'), {'requests'})During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/usr/bin/docker-compose", line 6, in <module>
from pkg_resources import load_entry_point
File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3252, in <module> File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3235, in _call_aside File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 3264, in _initialize_master_working_set File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 585, in _build_master File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 598, in _build_from_requirements File "/usr/lib/python3.9/site-packages/pkg_resources/__init__.py", line 786, in resolve
pkg_resources.DistributionNotFound: The 'idna<3,>=2.5' distribution was not found and is required by requests
Fixes:
https://gitlab.com/kubu93/buildroot/-/jobs/1522848327
--- ...na-3.x-to-be-installed-on-Python-3.x.patch | 33 +++++++++++++++++++ ...na-3.x-to-be-installed-on-Python-3.x.patch | 33 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch create mode 100644 package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch
package/python-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch new file +33 -0
@@ -0,0 +1,33 @@ +From d747c4753484aa9b90a094d6bf7ec45e5acfb623 Mon Sep 17 00:00:00 2001 +From: Naor Livne <[email protected]> +Date: Wed, 7 Jul 2021 16:25:20 +0300 +Subject: [PATCH] Allow idna 3.x to be installed on Python 3.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Co-authored-by: Mickaël Schoentgen <[email protected]> +Co-authored-by: Seth Michael Larson <[email protected]> +(cherry picked from commit 33cf965f7271ab4978ed551754db37865c4085db) +Signed-off-by: Romain Naour <[email protected]> +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7ba4b2a2..83d78665 100755 +--- a/setup.py ++++ b/setup.py +@@ -43,7 +43,8 @@ packages = ['requests'] + + requires = [ + 'chardet>=3.0.2,<5', +- 'idna>=2.5,<3', ++ 'idna>=2.5,<3; python_version < "3"', ++ 'idna>=2.5,<4; python_version >= "3"', + 'urllib3>=1.21.1,<1.27', + 'certifi>=2017.4.17' + +-- +2.31.1 +
package/python3-requests/0001-Allow-idna-3.x-to-be-installed-on-Python-3.x.patch new file +33 -0
@@ -0,0 +1,33 @@ +From d747c4753484aa9b90a094d6bf7ec45e5acfb623 Mon Sep 17 00:00:00 2001 +From: Naor Livne <[email protected]> +Date: Wed, 7 Jul 2021 16:25:20 +0300 +Subject: [PATCH] Allow idna 3.x to be installed on Python 3.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Co-authored-by: Mickaël Schoentgen <[email protected]> +Co-authored-by: Seth Michael Larson <[email protected]> +(cherry picked from commit 33cf965f7271ab4978ed551754db37865c4085db) +Signed-off-by: Romain Naour <[email protected]> +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7ba4b2a2..83d78665 100755 +--- a/setup.py ++++ b/setup.py +@@ -43,7 +43,8 @@ packages = ['requests'] + + requires = [ + 'chardet>=3.0.2,<5', +- 'idna>=2.5,<3', ++ 'idna>=2.5,<3; python_version < "3"', ++ 'idna>=2.5,<4; python_version >= "3"', + 'urllib3>=1.21.1,<1.27', + 'certifi>=2017.4.17' + +-- +2.31.1 +
Signature · 6 lines
2.31.1 _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Quoted 10 lines · On Sun, 22 Aug 2021 20:53:08 +0200 Romain Naour <[email protected]> wrote:
gcc 10.x is now used by default but the kernel 4.19 used by
test_docker_composedoesn't build with it.Bump the kernel to 4.19.204 release that contains a lot of fixes for newer gcc.
Signed-off-by Romain Naour <[email protected]>--- support/testing/tests/package/test_docker_compose.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Both applied to master, thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] http://lists.busybox.net/mailman/listinfo/buildroot
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
gcc 10.x is now used by default but the kernel 4.19 used by
test_docker_composedoesn't build with it.Bump the kernel to 4.19.204 release that contains a lot of fixes for newer gcc.
Signed-off-by Romain Naour <[email protected]>
Committed to 2021.02.x and 2021.05.x, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot