cxxtest: move to setuptools
PATCH 1/3 cxxtest: move to setuptools
setup.py has always supported setuptools, so change the inherit now that distutils is deprecated.
Leave S as the top of the source tree, and set SETUPUTILS_SETUP_PATH to find the setup.py.
Fix the hashbang in cxxtestgen, which was still pointing at python not python3.
--- meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb +7 -6
@@ -2,21 +2,22 @@ DESCRIPTION = "CxxTest is a unit testing framework for C++ that is similar in sp HOMEPAGE = "http://cxxtest.com/" SECTION = "devel" LICENSE = "LGPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/cxxtest-${PV}/COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" -SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/cxxtest-${PV}.tar.gz" +SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/${BP}.tar.gz" SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" -S = "${WORKDIR}/cxxtest-${PV}/python" +inherit setuptools3 -inherit distutils3 +SETUPTOOLS_SETUP_PATH = "${S}/python" do_install:append() { install -d ${D}${includedir} - cp -a ../cxxtest ${D}${includedir} + cp -a ${S}/cxxtest/ ${D}${includedir} + # Fix the interpretter as otherwise this points to the build host python sed '1c\ -#!/usr/bin/env python' -i ${D}${bindir}/cxxtestgen +#!/usr/bin/env python3' -i ${D}${bindir}/cxxtestgen } BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
PATCH 2/3 iotop: move to the C port of iotop
The Python iotop implentation hasn't had a release since 2013[1], and there is a C port which is actively maintained and will have a lower impact on the system being monitored.
[1] https://repo.or.cz/iotop.git/tag/10c60fedf5051421f4e62b89e2e51e7cc669ce34
--- meta-oe/recipes-extended/iotop/iotop_0.6.bb | 29 -------------------- meta-oe/recipes-extended/iotop/iotop_1.20.bb | 17 ++++++++++++ 2 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-extended/iotop/iotop_0.6.bb create mode 100644 meta-oe/recipes-extended/iotop/iotop_1.20.bb
meta-oe/recipes-extended/iotop/iotop_0.6.bb deleted +0 -29
@@ -1,29 +0,0 @@ -SUMMARY = "Simple top-like I/O monitor" -DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \ - It watches I/O usage information output by the Linux kernel and displays \ - a table of current I/O usage by processes on the system." -HOMEPAGE = "http://guichaz.free.fr/iotop/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -PV .= "+git${SRCPV}" - -SRCREV = "1bfb3bc70febb1ffb95146b6dcd65257228099a3" -SRC_URI = "git://repo.or.cz/iotop.git;branch=master" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "http://repo.or.cz/iotop.git/tags" -UPSTREAM_CHECK_REGEX = "iotop-(?P<pver>\d+(\.\d+)+)" - -inherit distutils3 - -do_install:append() { - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py || true -} - -RDEPENDS:${PN} = "python3-curses \ - python3-codecs python3-ctypes python3-pprint \ - python3-shell python3-core"
meta-oe/recipes-extended/iotop/iotop_1.20.bb new file +17 -0
@@ -0,0 +1,17 @@ +SUMMARY = "A top utility for I/O" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=48e7be78bd2671d08c9c3bad71f1cfaa" + +DEPENDS = "ncurses" + +SRC_URI = "https://github.com/Tomas-M/iotop/releases/download/v1.20/iotop-1.20.tar.xz" +SRC_URI[sha256sum] = "e0227dd4b71ce3ffe50225b85cf9abb38a99c1d2dff69e3f1db7d059d7490d51" +UPSTREAM_CHECK_URI = "https://github.com/Tomas-M/iotop/releases" + +inherit pkgconfig + +EXTRA_OEMAKE = "V=1 STRIP=true" + +do_install() { + oe_runmake install DESTDIR=${D} +}
Signature · 1 line
2.25.1
Re: [oe] [PATCH 2/3] iotop: move to the C port of iotop
It fails on clang/arm see
https://errors.yoctoproject.org/Errors/Details/622623/
Quoted 85 lines · Ross Burton
The Python iotop implentation hasn't had a release since 2013[1], and there is a C port which is actively maintained and will have a lower impact on the system being monitored.
[1] https://repo.or.cz/iotop.git/tag/10c60fedf5051421f4e62b89e2e51e7cc669ce34
Signed-off-by Ross Burton <[email protected]>--- meta-oe/recipes-extended/iotop/iotop_0.6.bb | 29 -------------------- meta-oe/recipes-extended/iotop/iotop_1.20.bb | 17 ++++++++++++ 2 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 meta-oe/recipes-extended/iotop/iotop_0.6.bb create mode 100644 meta-oe/recipes-extended/iotop/iotop_1.20.bbmeta-oe/recipes-extended/iotop/iotop_0.6.bb deleted +0
-29@@ -1,29 +0,0 @@ -SUMMARY = "Simple top-like I/O monitor" -DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \ - It watches I/O usage information output by the Linux kernel and displays \ - a table of current I/O usage by processes on the system." -HOMEPAGE = "http://guichaz.free.fr/iotop/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -PV .= "+git${SRCPV}" - -SRCREV = "1bfb3bc70febb1ffb95146b6dcd65257228099a3" -SRC_URI = "git://repo.or.cz/iotop.git;branch=master" - -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_URI = "http://repo.or.cz/iotop.git/tags" -UPSTREAM_CHECK_REGEX = "iotop-(?P<pver>\d+(\.\d+)+)" - -inherit distutils3 - -do_install:append() { - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true - rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py || true -} - -RDEPENDS:${PN} = "python3-curses \ - python3-codecs python3-ctypes python3-pprint \ - python3-shell python3-core"meta-oe/recipes-extended/iotop/iotop_1.20.bb new file +17
-1@@ -0,0 +1,17 @@ +SUMMARY = "A top utility for I/O" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://LICENSE;md5=48e7be78bd2671d08c9c3bad71f1cfaa" + +DEPENDS = "ncurses" + +SRC_URI = "https://github.com/Tomas-M/iotop/releases/download/v1.20/iotop-1.20.tar.xz" +SRC_URI[sha256sum] = "e0227dd4b71ce3ffe50225b85cf9abb38a99c1d2dff69e3f1db7d059d7490d51" +UPSTREAM_CHECK_URI = "https://github.com/Tomas-M/iotop/releases" + +inherit pkgconfig + +EXTRA_OEMAKE = "V=1 STRIP=true" + +do_install() { + oe_runmake install DESTDIR=${D} +} --2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#94828): https://lists.openembedded.org/g/openembedded-devel/message/94828
Mute This Topic: https://lists.openembedded.org/mt/88418863/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [PATCH 2/3] iotop: move to the C port of iotop
Quoted 2 lines · Khem Raj
It fails on clang/arm see
https://errors.yoctoproject.org/Errors/Details/622623/
That's clang segfaulting, fun! I don't have access to my build machine this weekend, can you just throw in TOOLCHAIN="gcc" for now?
Ross
Re: [oe] [PATCH 2/3] iotop: move to the C port of iotop
Quoted 7 lines · Ross Burton
Quoted 2 lines · Khem Raj
It fails on clang/arm see
https://errors.yoctoproject.org/Errors/Details/622623/That's clang segfaulting, fun! I don't have access to my build machine this weekend, can you just throw in TOOLCHAIN="gcc" for now?
Yeah and it’s with glibc master so not a big deal I will still extract a test case for reporting to llvm GitHub issue
Quoted 3 lines
Ross
PATCH 3/3 pyxdg: upgrade and remove distutils
In reply to Ross BurtonUpgrade to 0.27, and switch to setuptools now that distutils is deprecated.
---
meta-oe/recipes-gnome/pyxdg/{pyxdg_0.26.bb => pyxdg_0.27.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-gnome/pyxdg/{pyxdg_0.26.bb => pyxdg_0.27.bb} (82%)meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb renamed from meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb +2 -2
@@ -4,9 +4,9 @@ SECTION = "devel/python" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" -SRCREV = "7db14dcf4c4305c3859a2d9fcf9f5da2db328330" +SRCREV = "f097a66923a65e93640c48da83e6e9cfbddd86ba" SRC_URI = "git://anongit.freedesktop.org/xdg/pyxdg;branch=master" -inherit distutils3 +inherit setuptools3 S = "${WORKDIR}/git"
Signature · 1 line
2.25.1