From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 26 Mar 2024 19:53:36 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rpBvU-005gUb-0R for lore@lore.pengutronix.de; Tue, 26 Mar 2024 19:53:36 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rpBvT-0008G9-UK; Tue, 26 Mar 2024 19:53:35 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rpBv7-0008Fx-Uf; Tue, 26 Mar 2024 19:53:13 +0100 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rpBv7-008fJN-G0; Tue, 26 Mar 2024 19:53:13 +0100 Received: from mol by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rpBv7-0008Ob-1J; Tue, 26 Mar 2024 19:53:13 +0100 Date: Tue, 26 Mar 2024 19:53:13 +0100 From: Michael Olbrich To: Michiel Schelfhout Message-ID: Mail-Followup-To: Michiel Schelfhout , ptxdist@pengutronix.de References: <20240325083151.371704-1-michiel.schelfhout@protonic.nl> <20240326160334.489119-1-m.olbrich@pengutronix.de> <20240326171710.17308866.michiel.schelfhout@protonic.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240326171710.17308866.michiel.schelfhout@protonic.nl> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [APPLIED] python3: Add option to include ensurepip module X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false On Tue, Mar 26, 2024 at 05:17:10PM +0100, Michiel Schelfhout wrote: > 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? Right, we need to rename it. I'll take care of it. Michael > On Tue, 26 Mar 2024 17:03:34 +0100 > Michael Olbrich wrote: > > > Thanks, applied as 7662f004c174da6cf628793a86655c2dc95f8855. > > > > Michael > > > > [sent from post-receive hook] > > > > On Tue, 26 Mar 2024 17:03:34 +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 > > > Message-Id: <20240325083151.371704-1-michiel.schelfhout@protonic.nl> > > > Signed-off-by: Michael Olbrich > > > > > > 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) > -- 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 |