On 21/11/2022 13:00:43+0100, Alexandre Belloni wrote:
> Hello,
> 
> On 20/11/2022 19:10:41+0100, Markus Volk wrote:
> > Currently /usr/bin/python is provided by the python2 package. If python2
> > is not installed, the built image lacks a provider for it.
> > This results in failed scripts when using '/usr/bin/python' shebang.
> > 
> > This patch adds a /usr/bin/python symlink for python3 to fix this issue.
> 
> I think this is the cause of the following error:
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/103/builds/5098/steps/11/logs/stdio

Actually not, this error needs more investigation

> 
> > 
> > The link is created with relative path because using an absolute path would 
> > fail
> > for native and nativesdk.
> > 
> > Signed-off-by: Markus Volk <f_...@t-online.de>
> > ---
> >  meta/recipes-devtools/python/python3/python3-manifest.json | 1 +
> >  meta/recipes-devtools/python/python3_3.11.0.bb             | 4 ++++
> >  2 files changed, 5 insertions(+)
> > 
> > diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json 
> > b/meta/recipes-devtools/python/python3/python3-manifest.json
> > index 64203cf0fc..7b6f509a45 100644
> > --- a/meta/recipes-devtools/python/python3/python3-manifest.json
> > +++ b/meta/recipes-devtools/python/python3/python3-manifest.json
> > @@ -203,6 +203,7 @@
> >          "files": [
> >              "${bindir}/python${PYTHON_MAJMIN}",
> >              "${bindir}/python${PYTHON_MAJMIN}.real",
> > +            "${bindir}/python",
> >              "${bindir}/python3",
> >              "${includedir}/python${PYTHON_MAJMIN}/pyconfig*.h",
> >              "${libdir}/python${PYTHON_MAJMIN}/UserDict.py",
> > diff --git a/meta/recipes-devtools/python/python3_3.11.0.bb 
> > b/meta/recipes-devtools/python/python3_3.11.0.bb
> > index 92a1f69320..fec6705105 100644
> > --- a/meta/recipes-devtools/python/python3_3.11.0.bb
> > +++ b/meta/recipes-devtools/python/python3_3.11.0.bb
> > @@ -144,6 +144,7 @@ do_install:prepend() {
> >  
> >  do_install:append:class-target() {
> >          oe_multilib_header python${PYTHON_MAJMIN}/pyconfig.h
> > +        ln -sf ./python3 ${D}${bindir}/python
> >  }
> >  
> >  do_install:append:class-native() {
> > @@ -156,6 +157,7 @@ do_install:append:class-native() {
> >          # (these often end up too long for the #! parser in the kernel as 
> > the
> >          # buffer is 128 bytes long).
> >          ln -s python3-native/python3 ${D}${bindir}/nativepython3
> > +        ln -sf ./python3-native/python3 ${D}${bindir}/nativepython
> >  
> >          # Remove the opt-1.pyc and opt-2.pyc files. There are over 3,000 
> > of them
> >          # and the overhead in each recipe-sysroot-native isn't worth it, 
> > particularly
> > @@ -213,6 +215,7 @@ do_install:append() {
> >  }
> >  
> >  do_install:append:class-nativesdk () {
> > +    ln -sf ./python3 ${D}${bindir}/python
> >      # Make sure we use /usr/bin/env python
> >      for PYTHSCRIPT in `grep -rIl ${bindir}/python ${D}${bindir}`; do
> >           sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT
> > @@ -376,6 +379,7 @@ RRECOMMENDS:${PN}-crypt:append:class-nativesdk = " 
> > ${MLPREFIX}openssl ${MLPREFIX
> >  
> >  # For historical reasons PN is empty and provided by python3-modules
> >  FILES:${PN} = ""
> > +RPROVIDES:${PN} = "${bindir}/python"
> >  RPROVIDES:${PN}-modules = "${PN}"
> >  
> >  FILES:${PN}-pydoc += "${bindir}/pydoc${PYTHON_MAJMIN} ${bindir}/pydoc3"
> > -- 
> > 2.34.1
> > 
> 
> > 
> > 
> > 
> 
> 
> -- 
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#173662): 
https://lists.openembedded.org/g/openembedded-core/message/173662
Mute This Topic: https://lists.openembedded.org/mt/95156519/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to