From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 22 Mar 2024 09:28:45 +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 1rnaGb-00HJpQ-1U for lore@lore.pengutronix.de; Fri, 22 Mar 2024 09:28:45 +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 1rnaGa-0007FR-Th; Fri, 22 Mar 2024 09:28:44 +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 1rnaGD-0007Ei-Kw; Fri, 22 Mar 2024 09:28:21 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.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 1rnaGD-007oDB-4M; Fri, 22 Mar 2024 09:28:21 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rnaGD-002rTN-0H; Fri, 22 Mar 2024 09:28:21 +0100 Date: Fri, 22 Mar 2024 09:28:21 +0100 From: Michael Olbrich To: Michiel Schelfhout Message-ID: Mail-Followup-To: Michiel Schelfhout , ptxdist@pengutronix.de, mkl@pengutronix.de References: <20240320155941.539985-1-michiel.schelfhout@protonic.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240320155941.539985-1-michiel.schelfhout@protonic.nl> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH] 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: mkl@pengutronix.de, 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 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 > --- > 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 |