* [Buildroot] [PATCH v2 1/1] package/pkg-python.mk: fix PEP517 paths
@ 2022-03-30 22:45 James Hilliard
2022-04-03 8:33 ` Yann E. MORIN
0 siblings, 1 reply; 3+ messages in thread
From: James Hilliard @ 2022-03-30 22:45 UTC (permalink / raw)
To: buildroot; +Cc: Emile Cormier, James Hilliard, Thomas Petazzoni
From: Emile Cormier <emile.cormier.jr@gmail.com>
Use /usr target/staging prefix and / host prefix.
This allows the Python interpreter to find packages built via the new
Flit infrastructure and fixes bug #14721.
Signed-off-by: Emile Cormier <emile.cormier.jr@gmail.com>
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
Changes v1 -> v2:
- fixup formatting
- fix all pep517 prefix paths
---
package/pkg-python.mk | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
index 52ce402281..867341fc7b 100644
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -127,16 +127,16 @@ PKG_PYTHON_PEP517_ENV = \
PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \
--interpreter=/usr/bin/python \
--script-kind=posix \
- --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
- --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
+ --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
+ --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
--scripts=$(TARGET_DIR)/usr/bin \
--data=$(TARGET_DIR)/usr
PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \
--interpreter=/usr/bin/python \
--script-kind=posix \
- --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
- --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
+ --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
+ --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
--scripts=$(STAGING_DIR)/usr/bin \
--data=$(STAGING_DIR)/usr
@@ -147,12 +147,12 @@ HOST_PKG_PYTHON_PEP517_ENV = \
$(HOST_CONFIGURE_OPTS)
HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \
- --interpreter=/usr/bin/python \
+ --interpreter=/bin/python \
--script-kind=posix \
--purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
- --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
- --scripts=$(HOST_DIR)/usr/bin \
- --data=$(HOST_DIR)/usr
+ --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \
+ --scripts=$(HOST_DIR)/bin \
+ --data=$(HOST_DIR)
################################################################################
# inner-python-package -- defines how the configuration, compilation
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v2 1/1] package/pkg-python.mk: fix PEP517 paths
2022-03-30 22:45 [Buildroot] [PATCH v2 1/1] package/pkg-python.mk: fix PEP517 paths James Hilliard
@ 2022-04-03 8:33 ` Yann E. MORIN
2022-04-03 19:13 ` Emile Cormier
0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2022-04-03 8:33 UTC (permalink / raw)
To: James Hilliard; +Cc: Emile Cormier, Thomas Petazzoni, buildroot
James, Emile, All,
On 2022-03-30 16:45 -0600, James Hilliard spake thusly:
> From: Emile Cormier <emile.cormier.jr@gmail.com>
>
> Use /usr target/staging prefix and / host prefix.
>
> This allows the Python interpreter to find packages built via the new
> Flit infrastructure and fixes bug #14721.
Hint: if you reference bug fixes on their own line with:
Fixes: #14721
then it automatically gets picked up when doing the release email, and
helps closing the referenced bug.
> Signed-off-by: Emile Cormier <emile.cormier.jr@gmail.com>
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> Changes v1 -> v2:
> - fixup formatting
> - fix all pep517 prefix paths
> ---
> package/pkg-python.mk | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> index 52ce402281..867341fc7b 100644
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -127,16 +127,16 @@ PKG_PYTHON_PEP517_ENV = \
> PKG_PYTHON_PEP517_INSTALL_TARGET_OPTS = \
> --interpreter=/usr/bin/python \
> --script-kind=posix \
> - --purelib=$(TARGET_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
> - --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
> + --purelib=$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
> + --headers=$(TARGET_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
> --scripts=$(TARGET_DIR)/usr/bin \
> --data=$(TARGET_DIR)/usr
>
> PKG_PYTHON_PEP517_INSTALL_STAGING_OPTS = \
> --interpreter=/usr/bin/python \
> --script-kind=posix \
> - --purelib=$(STAGING_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
> - --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
> + --purelib=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
> + --headers=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
> --scripts=$(STAGING_DIR)/usr/bin \
> --data=$(STAGING_DIR)/usr
>
> @@ -147,12 +147,12 @@ HOST_PKG_PYTHON_PEP517_ENV = \
> $(HOST_CONFIGURE_OPTS)
>
> HOST_PKG_PYTHON_PEP517_INSTALL_OPTS = \
> - --interpreter=/usr/bin/python \
> + --interpreter=/bin/python \
> --script-kind=posix \
> --purelib=$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \
> - --headers=$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
> - --scripts=$(HOST_DIR)/usr/bin \
> - --data=$(HOST_DIR)/usr
> + --headers=$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR) \
> + --scripts=$(HOST_DIR)/bin \
> + --data=$(HOST_DIR)
>
> ################################################################################
> # inner-python-package -- defines how the configuration, compilation
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Buildroot] [PATCH v2 1/1] package/pkg-python.mk: fix PEP517 paths
2022-04-03 8:33 ` Yann E. MORIN
@ 2022-04-03 19:13 ` Emile Cormier
0 siblings, 0 replies; 3+ messages in thread
From: Emile Cormier @ 2022-04-03 19:13 UTC (permalink / raw)
To: Yann E. MORIN; +Cc: James Hilliard, Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 240 bytes --]
On Sun, Apr 3, 2022 at 5:33 AM Yann E. MORIN <yann.morin.1998@free.fr>
wrote:
> Applied to master, thanks.
>
> Regards,
> Yann E. MORIN.
>
I confirm that the PasswordHasher test works for me with the latest master.
Thanks Yann and James!
[-- Attachment #1.2: Type: text/html, Size: 560 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-03 19:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-30 22:45 [Buildroot] [PATCH v2 1/1] package/pkg-python.mk: fix PEP517 paths James Hilliard
2022-04-03 8:33 ` Yann E. MORIN
2022-04-03 19:13 ` Emile Cormier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox