* [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant
@ 2021-10-15 5:56 Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2, 2/4] package/python3-cryptography: drop package Fabrice Fontaine
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2021-10-15 5:56 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni, Asaf Kahlon
Since commit 0c7e30b43a5e98abfc8db521a6415b5a5c1c267f,
python-cryptography depends on python3. So python3-cryptography became
redundant at that point. As python3-cryptography is a host-only package,
while python-cryptography is a python-only package, add a host variant
to python-cryptography to be able to drop python3-cryptography.
While at it, drop host-python3-pip and host-python3-six as these
dependencies are not needed. Indeed, pip was never a dependency of
cryptography and six is not a dependency with python3 and will be
dropped in version 3.4 and
https://github.com/pyca/cryptography/commit/e66db8079d3fbd0110e87ece1fd48f4bfd9e48b9
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/python-cryptography/python-cryptography.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index 98c65e1528..1d903b03e9 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -14,5 +14,8 @@ PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project
PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography
PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl
+HOST_PYTHON_CRYPTOGRAPHY_NEEDS_HOST_PYTHON = python3
+HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python3-cffi host-openssl
$(eval $(python-package))
+$(eval $(host-python-package))
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2, 2/4] package/python3-cryptography: drop package
2021-10-15 5:56 [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant Fabrice Fontaine
@ 2021-10-15 5:56 ` Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2,3/4] package/python3-pip: " Fabrice Fontaine
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2021-10-15 5:56 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni, Asaf Kahlon
python3-cryptography is not needed anymore now that python-cryptography
has a host variant
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
.../python-cryptography.mk | 1 -
.../python3-cryptography.hash | 1 -
.../python3-cryptography.mk | 24 -------------------
3 files changed, 26 deletions(-)
delete mode 120000 package/python3-cryptography/python3-cryptography.hash
delete mode 100644 package/python3-cryptography/python3-cryptography.mk
diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
index 1d903b03e9..e21b9db042 100644
--- a/package/python-cryptography/python-cryptography.mk
+++ b/package/python-cryptography/python-cryptography.mk
@@ -4,7 +4,6 @@
#
################################################################################
-# Please keep in sync with package/python3-cryptography/python3-cryptography.mk
PYTHON_CRYPTOGRAPHY_VERSION = 3.3.2
PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz
PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d559879912eb8a1c5d16ad9f25d35f7c4f4c
diff --git a/package/python3-cryptography/python3-cryptography.hash b/package/python3-cryptography/python3-cryptography.hash
deleted file mode 120000
index 73fa25f572..0000000000
--- a/package/python3-cryptography/python3-cryptography.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-cryptography/python-cryptography.hash
\ No newline at end of file
diff --git a/package/python3-cryptography/python3-cryptography.mk b/package/python3-cryptography/python3-cryptography.mk
deleted file mode 100644
index 516864f315..0000000000
--- a/package/python3-cryptography/python3-cryptography.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-################################################################################
-#
-# python3-cryptography
-#
-################################################################################
-
-# Please keep in sync with package/python-cryptography/python-cryptography.mk
-PYTHON3_CRYPTOGRAPHY_VERSION = 3.3.2
-PYTHON3_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON3_CRYPTOGRAPHY_VERSION).tar.gz
-PYTHON3_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d559879912eb8a1c5d16ad9f25d35f7c4f4c
-PYTHON3_CRYPTOGRAPHY_SETUP_TYPE = setuptools
-PYTHON3_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause
-PYTHON3_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
-PYTHON3_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project
-PYTHON3_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography
-HOST_PYTHON3_CRYPTOGRAPHY_DL_SUBDIR = python-cryptography
-HOST_PYTHON3_CRYPTOGRAPHY_NEEDS_HOST_PYTHON = python3
-HOST_PYTHON3_CRYPTOGRAPHY_DEPENDENCIES = \
- host-openssl \
- host-python3-cffi \
- host-python3-pip \
- host-python3-six
-
-$(eval $(host-python-package))
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2,3/4] package/python3-pip: drop package
2021-10-15 5:56 [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2, 2/4] package/python3-cryptography: drop package Fabrice Fontaine
@ 2021-10-15 5:56 ` Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2,4/4] package/python-pip: needs python3 Fabrice Fontaine
2021-10-25 20:15 ` [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant Arnout Vandecappelle
3 siblings, 0 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2021-10-15 5:56 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni, Asaf Kahlon
Drop python3-pip now that python3-cryptography has been removed
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/python-pip/python-pip.mk | 1 -
package/python3-pip/python3-pip.hash | 1 -
package/python3-pip/python3-pip.mk | 19 -------------------
3 files changed, 21 deletions(-)
delete mode 120000 package/python3-pip/python3-pip.hash
delete mode 100644 package/python3-pip/python3-pip.mk
diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk
index ba7134e235..81fc87d5f0 100644
--- a/package/python-pip/python-pip.mk
+++ b/package/python-pip/python-pip.mk
@@ -4,7 +4,6 @@
#
################################################################################
-# Please keep in sync with package/python3-pip/python3-pip.mk
PYTHON_PIP_VERSION = 21.2.4
PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz
PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/52/e1/06c018197d8151383f66ebf6979d951995cf495629fc54149491f5d157d0
diff --git a/package/python3-pip/python3-pip.hash b/package/python3-pip/python3-pip.hash
deleted file mode 120000
index d90fb3d005..0000000000
--- a/package/python3-pip/python3-pip.hash
+++ /dev/null
@@ -1 +0,0 @@
-../python-pip/python-pip.hash
\ No newline at end of file
diff --git a/package/python3-pip/python3-pip.mk b/package/python3-pip/python3-pip.mk
deleted file mode 100644
index 5e20b06865..0000000000
--- a/package/python3-pip/python3-pip.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-#
-# python3-pip
-#
-################################################################################
-
-# Please keep in sync with package/python-pip/python-pip.mk
-PYTHON3_PIP_VERSION = 21.2.4
-PYTHON3_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz
-PYTHON3_PIP_SITE = https://files.pythonhosted.org/packages/52/e1/06c018197d8151383f66ebf6979d951995cf495629fc54149491f5d157d0
-PYTHON3_PIP_SETUP_TYPE = setuptools
-PYTHON3_PIP_LICENSE = MIT
-PYTHON3_PIP_LICENSE_FILES = LICENSE.txt
-PYTHON3_PIP_CPE_ID_VENDOR = pypa
-PYTHON3_PIP_CPE_ID_PRODUCT = pip
-HOST_PYTHON3_PIP_DL_SUBDIR = python-pip
-HOST_PYTHON3_PIP_NEEDS_HOST_PYTHON = python3
-
-$(eval $(host-python-package))
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2,4/4] package/python-pip: needs python3
2021-10-15 5:56 [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2, 2/4] package/python3-cryptography: drop package Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2,3/4] package/python3-pip: " Fabrice Fontaine
@ 2021-10-15 5:56 ` Fabrice Fontaine
2021-10-25 20:15 ` [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant Arnout Vandecappelle
3 siblings, 0 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2021-10-15 5:56 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine, Thomas Petazzoni, Asaf Kahlon
python 2 support has been dropped since version 21.0 resulting in the
following build failure since bump to version 21.2.4 in commit
3491f34d9ed97ac5980ff4a450367914b6985ff1:
File "setup.py", line 7
def read(rel_path: str) -> str:
^
Fixes:
- http://autobuild.buildroot.org/results/ed74f4ca96332454af329fac23505000c379d4a3
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Arnout Vandecappelle)
- Split patch
package/python-pip/Config.in | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/python-pip/Config.in b/package/python-pip/Config.in
index 61d8d7d317..92c3e3bd46 100644
--- a/package/python-pip/Config.in
+++ b/package/python-pip/Config.in
@@ -1,9 +1,8 @@
config BR2_PACKAGE_PYTHON_PIP
bool "python-pip"
- select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime
+ depends on BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
- select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
- select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+ select BR2_PACKAGE_PYTHON3_SSL
help
The PyPA recommended tool for installing Python packages.
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant
2021-10-15 5:56 [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant Fabrice Fontaine
` (2 preceding siblings ...)
2021-10-15 5:56 ` [Buildroot] [PATCH v2,4/4] package/python-pip: needs python3 Fabrice Fontaine
@ 2021-10-25 20:15 ` Arnout Vandecappelle
3 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2021-10-25 20:15 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot; +Cc: Asaf Kahlon, Thomas Petazzoni
On 15/10/2021 07:56, Fabrice Fontaine wrote:
> Since commit 0c7e30b43a5e98abfc8db521a6415b5a5c1c267f,
> python-cryptography depends on python3. So python3-cryptography became
> redundant at that point. As python3-cryptography is a host-only package,
> while python-cryptography is a python-only package, add a host variant
> to python-cryptography to be able to drop python3-cryptography.
>
> While at it, drop host-python3-pip and host-python3-six as these
> dependencies are not needed. Indeed, pip was never a dependency of
> cryptography and six is not a dependency with python3 and will be
> dropped in version 3.4 and
> https://github.com/pyca/cryptography/commit/e66db8079d3fbd0110e87ece1fd48f4bfd9e48b9
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/python-cryptography/python-cryptography.mk | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk
> index 98c65e1528..1d903b03e9 100644
> --- a/package/python-cryptography/python-cryptography.mk
> +++ b/package/python-cryptography/python-cryptography.mk
> @@ -14,5 +14,8 @@ PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
> PYTHON_CRYPTOGRAPHY_CPE_ID_VENDOR = cryptography_project
> PYTHON_CRYPTOGRAPHY_CPE_ID_PRODUCT = cryptography
> PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl
> +HOST_PYTHON_CRYPTOGRAPHY_NEEDS_HOST_PYTHON = python3
> +HOST_PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python3-cffi host-openssl
>
> $(eval $(python-package))
> +$(eval $(host-python-package))
You forgot to update ca-certificates to use host-python-cryptography instead
of python-cryptography. Could have been a separate patch, but I just did it as
part of this one.
Series applied to master, thanks.
Regards,
Arnout
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-10-25 20:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 5:56 [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2, 2/4] package/python3-cryptography: drop package Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2,3/4] package/python3-pip: " Fabrice Fontaine
2021-10-15 5:56 ` [Buildroot] [PATCH v2,4/4] package/python-pip: needs python3 Fabrice Fontaine
2021-10-25 20:15 ` [Buildroot] [PATCH v2, 1/4] package/python-cryptography: add host variant Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.