* [PATCH 1/3] asciidoc: update git repository
@ 2022-03-04 17:14 Ross Burton
2022-03-04 17:14 ` [PATCH 2/3] setuptools3.bbclass: clean up Ross Burton
2022-03-04 17:14 ` [PATCH 3/3] pip_install_wheel: " Ross Burton
0 siblings, 2 replies; 8+ messages in thread
From: Ross Burton @ 2022-03-04 17:14 UTC (permalink / raw)
To: openembedded-core
The asciidoc-py3 repository has been renamed to asciidoc-py.
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/recipes-extended/asciidoc/asciidoc_10.1.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/asciidoc/asciidoc_10.1.3.bb b/meta/recipes-extended/asciidoc/asciidoc_10.1.3.bb
index 34bf2550f5..fc8cbc89c8 100644
--- a/meta/recipes-extended/asciidoc/asciidoc_10.1.3.bb
+++ b/meta/recipes-extended/asciidoc/asciidoc_10.1.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4e5d1baf6f20559e3bec172226a47e4e \
file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 "
-SRC_URI = "git://github.com/asciidoc/asciidoc-py3;protocol=https;branch=main"
+SRC_URI = "git://github.com/asciidoc/asciidoc-py;protocol=https;branch=main"
SRCREV = "342639edbbc0dcc64354a0291d2214d4d5e65cab"
DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] setuptools3.bbclass: clean up
2022-03-04 17:14 [PATCH 1/3] asciidoc: update git repository Ross Burton
@ 2022-03-04 17:14 ` Ross Burton
2022-03-04 19:03 ` [OE-core] " Peter Kjellerstedt
2022-03-04 17:14 ` [PATCH 3/3] pip_install_wheel: " Ross Burton
1 sibling, 1 reply; 8+ messages in thread
From: Ross Burton @ 2022-03-04 17:14 UTC (permalink / raw)
To: openembedded-core
There's been a lot of work in this class lately, so a little spring
cleaning is needed.
Create wheels verbosely to help debug problems.
Remove unused SETUPTOOLS_INSTALL_ARGS, these can't be passed to
bdist_wheel.
Remove duplicate manipulation of files in bindir as pip_install_wheel
does the same.
Remove obsolete deletion of easy-install.pth, wheels don't generate that.
Remove obsolete ${datadir}/share fixup, pip-installed wheels can't
generate that path combination.
Remove purging of ${D} references from *.py, these won't be written by
standard setuptools, and recipes can do it themselves to work around
specific issues if needed.
Remove obsolete vardepsexclude of MACHINE on do_install, as that variable
isn't referenced.
Signed-off-by: Ross Burton <ross.burton@arm.com>
fixup! setuptools3.bbclass: clean up
---
meta/classes/setuptools3.bbclass | 34 +-------------------------------
1 file changed, 1 insertion(+), 33 deletions(-)
diff --git a/meta/classes/setuptools3.bbclass b/meta/classes/setuptools3.bbclass
index 564996c556..1b1a8aac76 100644
--- a/meta/classes/setuptools3.bbclass
+++ b/meta/classes/setuptools3.bbclass
@@ -4,13 +4,6 @@ inherit setuptools3-base pip_install_wheel
#B = "${WORKDIR}/build"
SETUPTOOLS_BUILD_ARGS ?= ""
-SETUPTOOLS_INSTALL_ARGS ?= "--root=${D} \
- --prefix=${prefix} \
- --install-lib=${PYTHON_SITEPACKAGES_DIR} \
- --install-data=${datadir}"
-
-SETUPTOOLS_PYTHON = "python3"
-SETUPTOOLS_PYTHON:class-native = "nativepython3"
SETUPTOOLS_SETUP_PATH ?= "${S}"
@@ -24,42 +17,17 @@ setuptools3_do_compile() {
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_LIBDIR=${STAGING_LIBDIR} \
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
- bdist_wheel ${SETUPTOOLS_BUILD_ARGS} || \
+ bdist_wheel --verbose ${SETUPTOOLS_BUILD_ARGS} || \
bbfatal_log "'${PYTHON_PN} setup.py bdist_wheel ${SETUPTOOLS_BUILD_ARGS}' execution failed."
}
setuptools3_do_compile[vardepsexclude] = "MACHINE"
do_compile[cleandirs] += "${SETUPTOOLS_SETUP_PATH}/dist"
setuptools3_do_install() {
- cd ${SETUPTOOLS_SETUP_PATH}
-
pip_install_wheel_do_install
-
- # support filenames with *spaces*
- find ${D} -name "*.py" -exec grep -q ${D} {} \; \
- -exec sed -i -e s:${D}::g {} \;
-
- for i in ${D}${bindir}/* ${D}${sbindir}/*; do
- if [ -f "$i" ]; then
- sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${SETUPTOOLS_PYTHON}:g $i
- sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
- fi
- done
-
- rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
-
- #
- # FIXME: Bandaid against wrong datadir computation
- #
- if [ -e ${D}${datadir}/share ]; then
- mv -f ${D}${datadir}/share/* ${D}${datadir}/
- rmdir ${D}${datadir}/share
- fi
}
-setuptools3_do_install[vardepsexclude] = "MACHINE"
EXPORT_FUNCTIONS do_configure do_compile do_install
export LDSHARED="${CCLD} -shared"
DEPENDS += "python3-setuptools-native python3-wheel-native"
-
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] pip_install_wheel: clean up
2022-03-04 17:14 [PATCH 1/3] asciidoc: update git repository Ross Burton
2022-03-04 17:14 ` [PATCH 2/3] setuptools3.bbclass: clean up Ross Burton
@ 2022-03-04 17:14 ` Ross Burton
2022-03-05 1:57 ` [OE-core] " Khem Raj
2022-03-05 8:22 ` Richard Purdie
1 sibling, 2 replies; 8+ messages in thread
From: Ross Burton @ 2022-03-04 17:14 UTC (permalink / raw)
To: openembedded-core
There's been a lot of work in this class lately, so a little spring
cleaning is needed.
Remove redundant creation of PYTHON_SITEPACKAGES_DIR, pip will do that.
Remove redundant export of PYPA_WHEEL.
Simplyify recompile code using "realpath --relative-to".
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/classes/pip_install_wheel.bbclass | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/meta/classes/pip_install_wheel.bbclass b/meta/classes/pip_install_wheel.bbclass
index 3beff685bb..1870b916fe 100644
--- a/meta/classes/pip_install_wheel.bbclass
+++ b/meta/classes/pip_install_wheel.bbclass
@@ -20,29 +20,20 @@ PIP_INSTALL_ARGS ?= "\
--prefix=${prefix} \
"
-pip_install_wheel_do_install:prepend () {
- install -d ${D}${PYTHON_SITEPACKAGES_DIR}
-}
-
-export PYPA_WHEEL
-
PIP_INSTALL_PYTHON = "python3"
PIP_INSTALL_PYTHON:class-native = "nativepython3"
pip_install_wheel_do_install () {
nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
- bbfatal_log "Failed to pip install wheel. Check the logs."
+ bbfatal_log "Failed to pip install wheel. Check the logs."
+ cd ${D}
for i in ${D}${bindir}/* ${D}${sbindir}/*; do
if [ -f "$i" ]; then
sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PIP_INSTALL_PYTHON}," $i
sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PIP_INSTALL_PYTHON}:g" $i
sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" $i
- # Recompile after modifying it
- cd ${D}
- file=`echo $i | sed 's:^${D}/::'`
- ${STAGING_BINDIR_NATIVE}/python3-native/python3 -c "from py_compile import compile; compile('$file')"
- cd -
+ nativepython3 -mpy_compile $(realpath --relative-to=${D} $i)
fi
done
}
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* RE: [OE-core] [PATCH 2/3] setuptools3.bbclass: clean up
2022-03-04 17:14 ` [PATCH 2/3] setuptools3.bbclass: clean up Ross Burton
@ 2022-03-04 19:03 ` Peter Kjellerstedt
0 siblings, 0 replies; 8+ messages in thread
From: Peter Kjellerstedt @ 2022-03-04 19:03 UTC (permalink / raw)
To: Ross Burton, openembedded-core
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Ross Burton
> Sent: den 4 mars 2022 18:14
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 2/3] setuptools3.bbclass: clean up
>
> There's been a lot of work in this class lately, so a little spring
> cleaning is needed.
>
> Create wheels verbosely to help debug problems.
>
> Remove unused SETUPTOOLS_INSTALL_ARGS, these can't be passed to
> bdist_wheel.
>
> Remove duplicate manipulation of files in bindir as pip_install_wheel
> does the same.
>
> Remove obsolete deletion of easy-install.pth, wheels don't generate that.
>
> Remove obsolete ${datadir}/share fixup, pip-installed wheels can't
> generate that path combination.
>
> Remove purging of ${D} references from *.py, these won't be written by
> standard setuptools, and recipes can do it themselves to work around
> specific issues if needed.
>
> Remove obsolete vardepsexclude of MACHINE on do_install, as that variable
> isn't referenced.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
>
> fixup! setuptools3.bbclass: clean up
That last line looks like some leftover from rebasing?
> ---
> meta/classes/setuptools3.bbclass | 34 +-------------------------------
> 1 file changed, 1 insertion(+), 33 deletions(-)
>
> diff --git a/meta/classes/setuptools3.bbclass
> b/meta/classes/setuptools3.bbclass
> index 564996c556..1b1a8aac76 100644
> --- a/meta/classes/setuptools3.bbclass
> +++ b/meta/classes/setuptools3.bbclass
> @@ -4,13 +4,6 @@ inherit setuptools3-base pip_install_wheel
> #B = "${WORKDIR}/build"
>
> SETUPTOOLS_BUILD_ARGS ?= ""
> -SETUPTOOLS_INSTALL_ARGS ?= "--root=${D} \
> - --prefix=${prefix} \
> - --install-lib=${PYTHON_SITEPACKAGES_DIR} \
> - --install-data=${datadir}"
> -
> -SETUPTOOLS_PYTHON = "python3"
> -SETUPTOOLS_PYTHON:class-native = "nativepython3"
>
> SETUPTOOLS_SETUP_PATH ?= "${S}"
>
> @@ -24,42 +17,17 @@ setuptools3_do_compile() {
> STAGING_INCDIR=${STAGING_INCDIR} \
> STAGING_LIBDIR=${STAGING_LIBDIR} \
> ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
> - bdist_wheel ${SETUPTOOLS_BUILD_ARGS} || \
> + bdist_wheel --verbose ${SETUPTOOLS_BUILD_ARGS} || \
> bbfatal_log "'${PYTHON_PN} setup.py bdist_wheel ${SETUPTOOLS_BUILD_ARGS}' execution failed."
Why all the backslashes? This is bitbake, not make. ;)
> }
> setuptools3_do_compile[vardepsexclude] = "MACHINE"
> do_compile[cleandirs] += "${SETUPTOOLS_SETUP_PATH}/dist"
>
> setuptools3_do_install() {
> - cd ${SETUPTOOLS_SETUP_PATH}
> -
> pip_install_wheel_do_install
> -
> - # support filenames with *spaces*
> - find ${D} -name "*.py" -exec grep -q ${D} {} \; \
> - -exec sed -i -e s:${D}::g {} \;
> -
> - for i in ${D}${bindir}/* ${D}${sbindir}/*; do
> - if [ -f "$i" ]; then
> - sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${SETUPTOOLS_PYTHON}:g $i
> - sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
> - fi
> - done
> -
> - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
> -
> - #
> - # FIXME: Bandaid against wrong datadir computation
> - #
> - if [ -e ${D}${datadir}/share ]; then
> - mv -f ${D}${datadir}/share/* ${D}${datadir}/
> - rmdir ${D}${datadir}/share
> - fi
> }
> -setuptools3_do_install[vardepsexclude] = "MACHINE"
>
> EXPORT_FUNCTIONS do_configure do_compile do_install
>
> export LDSHARED="${CCLD} -shared"
> DEPENDS += "python3-setuptools-native python3-wheel-native"
> -
> --
> 2.25.1
//Peter
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 3/3] pip_install_wheel: clean up
2022-03-04 17:14 ` [PATCH 3/3] pip_install_wheel: " Ross Burton
@ 2022-03-05 1:57 ` Khem Raj
2022-03-07 14:09 ` Ross Burton
2022-03-05 8:22 ` Richard Purdie
1 sibling, 1 reply; 8+ messages in thread
From: Khem Raj @ 2022-03-05 1:57 UTC (permalink / raw)
To: Ross Burton; +Cc: Patches and discussions about the oe-core layer
This is causing some install failures in meta-openembedded see
last five recipes in this batch
https://errors.yoctoproject.org/Errors/Details/651080/
https://errors.yoctoproject.org/Errors/Details/651082/
https://errors.yoctoproject.org/Errors/Details/651083/
https://errors.yoctoproject.org/Errors/Details/651084/
https://errors.yoctoproject.org/Errors/Details/651085/
These are the same failures across architectures and libcs.
On Fri, Mar 4, 2022 at 9:14 AM Ross Burton <ross@burtonini.com> wrote:
>
> There's been a lot of work in this class lately, so a little spring
> cleaning is needed.
>
> Remove redundant creation of PYTHON_SITEPACKAGES_DIR, pip will do that.
>
> Remove redundant export of PYPA_WHEEL.
>
> Simplyify recompile code using "realpath --relative-to".
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
> meta/classes/pip_install_wheel.bbclass | 15 +++------------
> 1 file changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/meta/classes/pip_install_wheel.bbclass b/meta/classes/pip_install_wheel.bbclass
> index 3beff685bb..1870b916fe 100644
> --- a/meta/classes/pip_install_wheel.bbclass
> +++ b/meta/classes/pip_install_wheel.bbclass
> @@ -20,29 +20,20 @@ PIP_INSTALL_ARGS ?= "\
> --prefix=${prefix} \
> "
>
> -pip_install_wheel_do_install:prepend () {
> - install -d ${D}${PYTHON_SITEPACKAGES_DIR}
> -}
> -
> -export PYPA_WHEEL
> -
> PIP_INSTALL_PYTHON = "python3"
> PIP_INSTALL_PYTHON:class-native = "nativepython3"
>
> pip_install_wheel_do_install () {
> nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
> - bbfatal_log "Failed to pip install wheel. Check the logs."
> + bbfatal_log "Failed to pip install wheel. Check the logs."
>
> + cd ${D}
> for i in ${D}${bindir}/* ${D}${sbindir}/*; do
> if [ -f "$i" ]; then
> sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PIP_INSTALL_PYTHON}," $i
> sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PIP_INSTALL_PYTHON}:g" $i
> sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" $i
> - # Recompile after modifying it
> - cd ${D}
> - file=`echo $i | sed 's:^${D}/::'`
> - ${STAGING_BINDIR_NATIVE}/python3-native/python3 -c "from py_compile import compile; compile('$file')"
> - cd -
> + nativepython3 -mpy_compile $(realpath --relative-to=${D} $i)
> fi
> done
> }
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#162746): https://lists.openembedded.org/g/openembedded-core/message/162746
> Mute This Topic: https://lists.openembedded.org/mt/89553658/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 3/3] pip_install_wheel: clean up
2022-03-04 17:14 ` [PATCH 3/3] pip_install_wheel: " Ross Burton
2022-03-05 1:57 ` [OE-core] " Khem Raj
@ 2022-03-05 8:22 ` Richard Purdie
2022-03-05 11:05 ` Ross Burton
1 sibling, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2022-03-05 8:22 UTC (permalink / raw)
To: Ross Burton, openembedded-core
On Fri, 2022-03-04 at 17:14 +0000, Ross Burton wrote:
> There's been a lot of work in this class lately, so a little spring
> cleaning is needed.
>
> Remove redundant creation of PYTHON_SITEPACKAGES_DIR, pip will do that.
>
> Remove redundant export of PYPA_WHEEL.
>
> Simplyify recompile code using "realpath --relative-to".
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
> meta/classes/pip_install_wheel.bbclass | 15 +++------------
> 1 file changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/meta/classes/pip_install_wheel.bbclass b/meta/classes/pip_install_wheel.bbclass
> index 3beff685bb..1870b916fe 100644
> --- a/meta/classes/pip_install_wheel.bbclass
> +++ b/meta/classes/pip_install_wheel.bbclass
> @@ -20,29 +20,20 @@ PIP_INSTALL_ARGS ?= "\
> --prefix=${prefix} \
> "
>
> -pip_install_wheel_do_install:prepend () {
> - install -d ${D}${PYTHON_SITEPACKAGES_DIR}
> -}
> -
> -export PYPA_WHEEL
> -
> PIP_INSTALL_PYTHON = "python3"
> PIP_INSTALL_PYTHON:class-native = "nativepython3"
>
> pip_install_wheel_do_install () {
> nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
> - bbfatal_log "Failed to pip install wheel. Check the logs."
> + bbfatal_log "Failed to pip install wheel. Check the logs."
>
> + cd ${D}
> for i in ${D}${bindir}/* ${D}${sbindir}/*; do
> if [ -f "$i" ]; then
> sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PIP_INSTALL_PYTHON}," $i
> sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PIP_INSTALL_PYTHON}:g" $i
> sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" $i
> - # Recompile after modifying it
> - cd ${D}
> - file=`echo $i | sed 's:^${D}/::'`
> - ${STAGING_BINDIR_NATIVE}/python3-native/python3 -c "from py_compile import compile; compile('$file')"
> - cd -
> + nativepython3 -mpy_compile $(realpath --relative-to=${D} $i)
This last bit likely doesn't work unless you are in ${D} when you run the
command :/.
Cheers,
Richard
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 3/3] pip_install_wheel: clean up
2022-03-05 8:22 ` Richard Purdie
@ 2022-03-05 11:05 ` Ross Burton
0 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2022-03-05 11:05 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
I think I found a bug in the dependency chasing code...
Ross
On Sat, 5 Mar 2022 at 08:22, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Fri, 2022-03-04 at 17:14 +0000, Ross Burton wrote:
> > There's been a lot of work in this class lately, so a little spring
> > cleaning is needed.
> >
> > Remove redundant creation of PYTHON_SITEPACKAGES_DIR, pip will do that.
> >
> > Remove redundant export of PYPA_WHEEL.
> >
> > Simplyify recompile code using "realpath --relative-to".
> >
> > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > ---
> > meta/classes/pip_install_wheel.bbclass | 15 +++------------
> > 1 file changed, 3 insertions(+), 12 deletions(-)
> >
> > diff --git a/meta/classes/pip_install_wheel.bbclass b/meta/classes/pip_install_wheel.bbclass
> > index 3beff685bb..1870b916fe 100644
> > --- a/meta/classes/pip_install_wheel.bbclass
> > +++ b/meta/classes/pip_install_wheel.bbclass
> > @@ -20,29 +20,20 @@ PIP_INSTALL_ARGS ?= "\
> > --prefix=${prefix} \
> > "
> >
> > -pip_install_wheel_do_install:prepend () {
> > - install -d ${D}${PYTHON_SITEPACKAGES_DIR}
> > -}
> > -
> > -export PYPA_WHEEL
> > -
> > PIP_INSTALL_PYTHON = "python3"
> > PIP_INSTALL_PYTHON:class-native = "nativepython3"
> >
> > pip_install_wheel_do_install () {
> > nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
> > - bbfatal_log "Failed to pip install wheel. Check the logs."
> > + bbfatal_log "Failed to pip install wheel. Check the logs."
> >
> > + cd ${D}
> > for i in ${D}${bindir}/* ${D}${sbindir}/*; do
> > if [ -f "$i" ]; then
> > sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PIP_INSTALL_PYTHON}," $i
> > sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PIP_INSTALL_PYTHON}:g" $i
> > sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" $i
> > - # Recompile after modifying it
> > - cd ${D}
> > - file=`echo $i | sed 's:^${D}/::'`
> > - ${STAGING_BINDIR_NATIVE}/python3-native/python3 -c "from py_compile import compile; compile('$file')"
> > - cd -
> > + nativepython3 -mpy_compile $(realpath --relative-to=${D} $i)
>
> This last bit likely doesn't work unless you are in ${D} when you run the
> command :/.
>
> Cheers,
>
> Richard
>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH 3/3] pip_install_wheel: clean up
2022-03-05 1:57 ` [OE-core] " Khem Raj
@ 2022-03-07 14:09 ` Ross Burton
0 siblings, 0 replies; 8+ messages in thread
From: Ross Burton @ 2022-03-07 14:09 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
These appear to be because the new compile code doesn't ignore errors,
and the loop compiles everything installed in $bindir, even cmd.exe or
Bash scripts...
I'll make the loop stricter.
Ross
On Sat, 5 Mar 2022 at 01:57, Khem Raj <raj.khem@gmail.com> wrote:
>
> This is causing some install failures in meta-openembedded see
> last five recipes in this batch
>
> https://errors.yoctoproject.org/Errors/Details/651080/
> https://errors.yoctoproject.org/Errors/Details/651082/
> https://errors.yoctoproject.org/Errors/Details/651083/
> https://errors.yoctoproject.org/Errors/Details/651084/
> https://errors.yoctoproject.org/Errors/Details/651085/
>
> These are the same failures across architectures and libcs.
>
>
>
> On Fri, Mar 4, 2022 at 9:14 AM Ross Burton <ross@burtonini.com> wrote:
> >
> > There's been a lot of work in this class lately, so a little spring
> > cleaning is needed.
> >
> > Remove redundant creation of PYTHON_SITEPACKAGES_DIR, pip will do that.
> >
> > Remove redundant export of PYPA_WHEEL.
> >
> > Simplyify recompile code using "realpath --relative-to".
> >
> > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > ---
> > meta/classes/pip_install_wheel.bbclass | 15 +++------------
> > 1 file changed, 3 insertions(+), 12 deletions(-)
> >
> > diff --git a/meta/classes/pip_install_wheel.bbclass b/meta/classes/pip_install_wheel.bbclass
> > index 3beff685bb..1870b916fe 100644
> > --- a/meta/classes/pip_install_wheel.bbclass
> > +++ b/meta/classes/pip_install_wheel.bbclass
> > @@ -20,29 +20,20 @@ PIP_INSTALL_ARGS ?= "\
> > --prefix=${prefix} \
> > "
> >
> > -pip_install_wheel_do_install:prepend () {
> > - install -d ${D}${PYTHON_SITEPACKAGES_DIR}
> > -}
> > -
> > -export PYPA_WHEEL
> > -
> > PIP_INSTALL_PYTHON = "python3"
> > PIP_INSTALL_PYTHON:class-native = "nativepython3"
> >
> > pip_install_wheel_do_install () {
> > nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PYPA_WHEEL} ||
> > - bbfatal_log "Failed to pip install wheel. Check the logs."
> > + bbfatal_log "Failed to pip install wheel. Check the logs."
> >
> > + cd ${D}
> > for i in ${D}${bindir}/* ${D}${sbindir}/*; do
> > if [ -f "$i" ]; then
> > sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PIP_INSTALL_PYTHON}," $i
> > sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PIP_INSTALL_PYTHON}:g" $i
> > sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" $i
> > - # Recompile after modifying it
> > - cd ${D}
> > - file=`echo $i | sed 's:^${D}/::'`
> > - ${STAGING_BINDIR_NATIVE}/python3-native/python3 -c "from py_compile import compile; compile('$file')"
> > - cd -
> > + nativepython3 -mpy_compile $(realpath --relative-to=${D} $i)
> > fi
> > done
> > }
> > --
> > 2.25.1
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#162746): https://lists.openembedded.org/g/openembedded-core/message/162746
> > Mute This Topic: https://lists.openembedded.org/mt/89553658/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-03-07 14:09 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-04 17:14 [PATCH 1/3] asciidoc: update git repository Ross Burton
2022-03-04 17:14 ` [PATCH 2/3] setuptools3.bbclass: clean up Ross Burton
2022-03-04 19:03 ` [OE-core] " Peter Kjellerstedt
2022-03-04 17:14 ` [PATCH 3/3] pip_install_wheel: " Ross Burton
2022-03-05 1:57 ` [OE-core] " Khem Raj
2022-03-07 14:09 ` Ross Burton
2022-03-05 8:22 ` Richard Purdie
2022-03-05 11:05 ` Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.