[OE-core] [PATCH 1/2] systemtap: Enable for riscv64
Signed-off-by: Khem Raj --- meta/recipes-kernel/systemtap/systemtap_git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index b7218f02e05..5b5521b174e 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -11,7 +11,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git;branch=master \ file://0001-PR28804-tune-default-stap-s-buffer-size-on-small-RAM.patch \ " -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' COMPATIBLE_HOST:libc-musl = 'null' S = "${WORKDIR}/git" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162780): https://lists.openembedded.org/g/openembedded-core/message/162780 Mute This Topic: https://lists.openembedded.org/mt/89585862/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] packagegroup-core-tools-profile: Enable systemtap for riscv64
Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-core-tools-profile.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 84eb46b9c21..6330200d2f0 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -35,7 +35,6 @@ PERF:riscv32 = "" SYSTEMTAP = "systemtap" SYSTEMTAP:libc-musl = "" SYSTEMTAP:nios2 = "" -SYSTEMTAP:riscv64 = "" SYSTEMTAP:riscv32 = "" LTTNGTOOLS = "lttng-tools" -- 2.35.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162781): https://lists.openembedded.org/g/openembedded-core/message/162781 Mute This Topic: https://lists.openembedded.org/mt/89585863/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] setuptools_build_meta: remove python dependency
when building additional native python tools that should be used for additional tasks in python3 package (class-target), the dependency on target class python creates a dependency loop: python3-foo-native_1.2.3.bb:do_prepare_recipe_sysroot python3-pep8-native_1.7.1.bb:do_populate_sysroot python3-wheel_0.37.1.bb:do_populate_sysroot python3-bar-native_0.1.2.bb:do_populate_sysroot python3-pip_22.0.3.bb:do_populate_sysroot python3-pyflakes-native_2.4.0.bb:do_populate_sysroot python3_3.10.2.bb:do_populate_sysroot python3-foo-native_1.2.3_1.2.0.bb:do_fetch python3-setuptools_59.5.0.bb:do_populate_sysroot resolve this by removing python3 from DEPENDS. The correct dependencies are already injected by setuptools-base class Signed-off-by: Konrad Weihmann --- meta/classes/setuptools_build_meta.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/setuptools_build_meta.bbclass b/meta/classes/setuptools_build_meta.bbclass index b1441e65dd..8f5479e922 100644 --- a/meta/classes/setuptools_build_meta.bbclass +++ b/meta/classes/setuptools_build_meta.bbclass @@ -1,6 +1,6 @@ inherit pip_install_wheel setuptools3-base -DEPENDS += "python3 python3-setuptools-native python3-wheel-native" +DEPENDS += "python3-setuptools-native python3-wheel-native" setuptools_build_meta_do_configure () { mkdir -p ${S}/dist -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162779): https://lists.openembedded.org/g/openembedded-core/message/162779 Mute This Topic: https://lists.openembedded.org/mt/89568035/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 3/3] pip_install_wheel: clean up
I think I found a bug in the dependency chasing code... Ross On Sat, 5 Mar 2022 at 08:22, Richard Purdie wrote: > > On Fri, 2022-03-04 at 17:14 +, 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 > > --- > > 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 > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162778): https://lists.openembedded.org/g/openembedded-core/message/162778 Mute This Topic: https://lists.openembedded.org/mt/89553658/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 3/3] pip_install_wheel: clean up
On Fri, 2022-03-04 at 17:14 +, 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 > --- > 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 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162777): https://lists.openembedded.org/g/openembedded-core/message/162777 Mute This Topic: https://lists.openembedded.org/mt/89553658/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-