From patchwork Fri Jan 14 11:52:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2447 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40262C433F5 for ; Fri, 14 Jan 2022 11:52:51 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.6113.1642161170465795334 for ; Fri, 14 Jan 2022 03:52:50 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3D575ED1 for ; Fri, 14 Jan 2022 03:52:49 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D8B933F5A1 for ; Fri, 14 Jan 2022 03:52:48 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 1/3] cxxtest: move to setuptools Date: Fri, 14 Jan 2022 11:52:44 +0000 Message-Id: <20220114115246.3985850-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Jan 2022 11:52:51 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94827 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. Signed-off-by: Ross Burton --- meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb index b760690652..65b54ed548 100644 --- a/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb +++ b/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb @@ -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" From patchwork Fri Jan 14 11:52:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2449 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CB3AC4332F for ; Fri, 14 Jan 2022 11:52:52 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.6115.1642161170963899451 for ; Fri, 14 Jan 2022 03:52:51 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C4598101E for ; Fri, 14 Jan 2022 03:52:49 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6D4913F5A1 for ; Fri, 14 Jan 2022 03:52:49 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 2/3] iotop: move to the C port of iotop Date: Fri, 14 Jan 2022 11:52:45 +0000 Message-Id: <20220114115246.3985850-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220114115246.3985850-1-ross.burton@arm.com> References: <20220114115246.3985850-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Jan 2022 11:52:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94828 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 --- 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 diff --git a/meta-oe/recipes-extended/iotop/iotop_0.6.bb b/meta-oe/recipes-extended/iotop/iotop_0.6.bb deleted file mode 100644 index 97958dd4a2..0000000000 --- a/meta-oe/recipes-extended/iotop/iotop_0.6.bb +++ /dev/null @@ -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\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" diff --git a/meta-oe/recipes-extended/iotop/iotop_1.20.bb b/meta-oe/recipes-extended/iotop/iotop_1.20.bb new file mode 100644 index 0000000000..17c567095b --- /dev/null +++ b/meta-oe/recipes-extended/iotop/iotop_1.20.bb @@ -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} +} From patchwork Fri Jan 14 11:52:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 2448 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25CC7C433EF for ; Fri, 14 Jan 2022 11:52:52 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.6116.1642161171150025293 for ; Fri, 14 Jan 2022 03:52:51 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 576BF11B3 for ; Fri, 14 Jan 2022 03:52:50 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 029A93F5A1 for ; Fri, 14 Jan 2022 03:52:49 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 3/3] pyxdg: upgrade and remove distutils Date: Fri, 14 Jan 2022 11:52:46 +0000 Message-Id: <20220114115246.3985850-3-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220114115246.3985850-1-ross.burton@arm.com> References: <20220114115246.3985850-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 14 Jan 2022 11:52:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94829 Upgrade to 0.27, and switch to setuptools now that distutils is deprecated. Signed-off-by: Ross Burton --- 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%) diff --git a/meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb b/meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb similarity index 82% rename from meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb rename to meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb index 6fa31c58ff..35ecd7ff5d 100644 --- a/meta-oe/recipes-gnome/pyxdg/pyxdg_0.26.bb +++ b/meta-oe/recipes-gnome/pyxdg/pyxdg_0.27.bb @@ -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"