From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 26 Mar 2024 17:17:21 +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 1rp9UH-005T9L-2B for lore@lore.pengutronix.de; Tue, 26 Mar 2024 17:17:21 +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 1rp9UH-000295-0A; Tue, 26 Mar 2024 17:17:21 +0100 Received: from smtp16.bhosted.nl ([2a02:9e0:8000::27]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rp9U8-00024i-8l for ptxdist@pengutronix.de; Tue, 26 Mar 2024 17:17:12 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonic.nl; s=202111; h=content-transfer-encoding:content-type:mime-version:references:in-reply-to: message-id:subject:cc:to:from:date:from; bh=JYMz6eWJVjUv7QEbS8kWAORhSSjrvxw8kDpSuuml9CM=; b=cazS7ElQ6pWOYxXAuz8fsGvLtFoUqXEprqPO319smB0PNMdgbyEY64DU3zgNv+4vTIqoy3YpIXQ8v 0c+nAY0TyA8gQV19NU/b1CY85RqLAL96tV8MbCGAPQzY0pChJfXjkukA5wagxvzyDexG0i/pZK53Cv ttilvH9GXZmyvvwognW3deBYzQIUwn0bcyRP/LzKg5hRK+lZfQJOpRwizRidfpwcyiAyBC0ZmNFNvo NrnFgrdD7nX7bNkQJ1JezCNRavLrrkuZoBctfjAIVcGmKBDnvooRXDYGl/AXcJRiu9LEOuxZYq6he2 XGTACg9esXthogldcNiOe9ryAci9SWw== X-MSG-ID: 4ca18209-eb8c-11ee-845a-005056817704 Date: Tue, 26 Mar 2024 17:17:10 +0100 From: Michiel Schelfhout To: Michael Olbrich Message-ID: <20240326171710.17308866.michiel.schelfhout@protonic.nl> In-Reply-To: <20240326160334.489119-1-m.olbrich@pengutronix.de> References: <20240325083151.371704-1-michiel.schelfhout@protonic.nl> <20240326160334.489119-1-m.olbrich@pengutronix.de> Organization: Protonic Holland X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 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 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 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)