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

[Michiel Schelfhout <michiel.schelfhout@protonic.nl>]

Hi Michael,

I just discovered that this causes a problem with oldconfig. When I run
oldconfig I get the following: 

.config:1959:warning: override: reassigning to symbol PYTHON3_PIP

I think this is caused by
https://git.pengutronix.de/cgit/ptxdist/tree/scripts/migrate/migrate_ptx?h=ptxdist-2024.03.0#n428

So this probably means we cannot reuse the symbol PYTHON3_ENSUREPIP?

Regards,

Michiel

On Tue, 26 Mar 2024 17:03:34 +0100
Michael Olbrich <m.olbrich@pengutronix.de> wrote:

> Thanks, applied as 7662f004c174da6cf628793a86655c2dc95f8855.
> 
> Michael
> 
> [sent from post-receive hook]
> 
> On Tue, 26 Mar 2024 17:03:34 +0100, Michiel Schelfhout
> <michiel.schelfhout@protonic.nl> 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>
> > Message-Id: <20240325083151.371704-1-michiel.schelfhout@protonic.nl>
> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> > 
> > diff --git a/rules/python3.in b/rules/python3.in
> > index 70fc44f17b20..afa33b077cbf 100644
> > --- a/rules/python3.in
> > +++ b/rules/python3.in
> > @@ -62,6 +62,10 @@ config PYTHON3_DISTUTILS
> >  	bool
> >  	prompt "Include distutils packages"
> >  
> > +config PYTHON3_ENSUREPIP
> > +	bool
> > +	prompt "Include ensurepip module"
> > +
> >  endif
> >  
> >  menu "python3 Extra Modules         "
> > diff --git a/rules/python3.make b/rules/python3.make
> > index 99a553c008d7..ae128c12a4f3 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)