[ptxdist] [PATCH] python3: Add option to include ensurepip module

[ptxdist] [PATCH] python3: Add option to include ensurepip module

[Michiel Schelfhout]

The configuration option --without-ensurepip disables ensurepip at install
time, but the module is still included.

Signed-off-by: Michiel Schelfhout <michiel.schelfhout@protonic.nl>
---
 rules/python3.in   | 5 +++++
 rules/python3.make | 1 +
 2 files changed, 6 insertions(+)

diff --git a/rules/python3.in b/rules/python3.in
index 70fc44f17..9ab89f9df 100644
--- a/rules/python3.in
+++ b/rules/python3.in
@@ -62,6 +62,11 @@ config PYTHON3_DISTUTILS
 	bool
 	prompt "Include distutils packages"
 
+config PYTHON3_ENSUREPIP
+	bool
+	prompt "Include ensurepip module"
+	default y
+
 endif
 
 menu "python3 Extra Modules         "
diff --git a/rules/python3.make b/rules/python3.make
index 99a553c00..ae128c12a 100644
--- a/rules/python3.make
+++ b/rules/python3.make
@@ -166,6 +166,7 @@ PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_READLINE)	+= */readline*so
 PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SQLITE)	+= */sqlite3 */_sqlite3*.so
 PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SSL)		+= */ssl.pyc */_ssl*.so */hashlib.pyc */_hashlib*.so
 PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_DISTUTILS)	+= */distutils
+PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_ENSUREPIP)	+= */ensurepip
 
 $(STATEDIR)/python3.targetinstall:
 	@$(call targetinfo)
-- 
2.40.1

Re: [ptxdist] [PATCH] python3: Add option to include ensurepip module

[Michael Olbrich]

On Wed, Mar 20, 2024 at 04:59:41PM +0100, Michiel Schelfhout wrote:
> The configuration option --without-ensurepip disables ensurepip at install
> time, but the module is still included.
> 
> Signed-off-by: Michiel Schelfhout <michiel.schelfhout@protonic.nl>
> ---
>  rules/python3.in   | 5 +++++
>  rules/python3.make | 1 +
>  2 files changed, 6 insertions(+)
> 
> diff --git a/rules/python3.in b/rules/python3.in
> index 70fc44f17..9ab89f9df 100644
> --- a/rules/python3.in
> +++ b/rules/python3.in
> @@ -62,6 +62,11 @@ config PYTHON3_DISTUTILS
>  	bool
>  	prompt "Include distutils packages"
>  
> +config PYTHON3_ENSUREPIP
> +	bool
> +	prompt "Include ensurepip module"
> +	default y

I think this should be disabled by default. That was the intention anyways
and for those that need it, it should be pretty obvious that it's gone.

Michael

> +
>  endif
>  
>  menu "python3 Extra Modules         "
> diff --git a/rules/python3.make b/rules/python3.make
> index 99a553c00..ae128c12a 100644
> --- a/rules/python3.make
> +++ b/rules/python3.make
> @@ -166,6 +166,7 @@ PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_READLINE)	+= */readline*so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SQLITE)	+= */sqlite3 */_sqlite3*.so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SSL)		+= */ssl.pyc */_ssl*.so */hashlib.pyc */_hashlib*.so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_DISTUTILS)	+= */distutils
> +PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_ENSUREPIP)	+= */ensurepip
>  
>  $(STATEDIR)/python3.targetinstall:
>  	@$(call targetinfo)
> -- 
> 2.40.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |