From patchwork Fri Jan 7 17:24:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maohui Lei (Fujitsu)" X-Patchwork-Id: 2119 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 13B73C4332F for ; Fri, 7 Jan 2022 08:25:20 +0000 (UTC) Received: from mail1.bemta34.messagelabs.com (mail1.bemta34.messagelabs.com [195.245.231.2]) by mx.groups.io with SMTP id smtpd.web09.4216.1641543918802699743 for ; Fri, 07 Jan 2022 00:25:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=ad38srYg; spf=pass (domain: fujitsu.com, ip: 195.245.231.2, mailfrom: leimaohui@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1641543916; i=@fujitsu.com; bh=gG5RXq6bRXH65ZrRZDpOAPRaYX1CzdhfHNxNGmkbitc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ad38srYgAU6ECzFBYWee/Jr9qldWVUFt2Ib0IEfpBRJOp4DT9QibpwRFfr6cbnFdr mnezr+JPR0P2ZIzb4wCzbMWipEQxdbV3sAzrbMpFYIak35Q3vCQY9a2PgQSOXHn58L XrCfPVHU0yeYhWFxp/EHiEz2oNunO6UdsGjqF6bh3pmCWmxg+fdzsHdWFFmBCW2c1A njhaWQgnxnm9KVyKHCHaM+Z5OHAjiq+zA3WZGzEZicf5jgAJcch53Y5hGhIAgVu5n4 NyMopOHj6DUr8j0MnRG9PQ6Gq8ybBeAaszCP0kf9zVpEOL92ACoAlaIk8F++Ajnb5e WcWp/UH6FvM5Q== Received: from [100.115.37.212] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-2.bemta.az-a.eu-west-2.aws.ess.symcld.net id E7/01-27579-CE8F7D16; Fri, 07 Jan 2022 08:25:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLIsWRWlGSWpSXmKPExsViZ8MRovv6x/V Eg2mdRhYXDy9ldmD0OLdxBWMAYxRrZl5SfkUCa8bi9efYCt4rVnye8oi1gfGhbBcjJ4eQwAwm iU2zqiHsPYwSK3ZXgthsAhoSu6deZgaxRQT0JZbO3gNmMwuoSRx9+RPMFhawkXh44QMjiM0io CJx9Pl6FhCbV8BFYsamyWwgtoSAgsSUh+/B6jkFXCVm37zJBLHLRWLSXwibV0BQ4uTMJywQ8y UkDr54wQzRqyTx9tIeRgi7QmLWrDamCYz8s5C0zELSsoCRaRWjdVJRZnpGSW5iZo6uoYGBrqG hqa6xka6hhaVeYpVuol5qqW55anGJrpFeYnmxXmpxsV5xZW5yTopeXmrJJkZgSKYUK+zdwXh5 5U+9Q4ySHExKorzi764nCvEl5adUZiQWZ8QXleakFh9ilOHgUJLgXXILKCdYlJqeWpGWmQOMD 5i0BAePkgivADBGhHiLCxJzizPTIVKnGGM57h2dt4iZ483aJUDyLZhsu3cXSLaDyZkLDq5m5p gFJu+3HwKSD0CkEEtefl6qlDjv/+9AQwVAhmaU5sGthKWCS4yyUsK8jAwMDEI8BalFuZklqPK vGMU5GJWEeZeBTOHJzCuBu+wV0NFMQEevEAY7uiQRISXVwFRbcH520bft5mH8E0JO2vx4/WLx oR/tSrdnVLtF+Wk4HCldfGJBqYBksca3Z/vEsqX6n2yo1OLk3HfcP3pZ8M9LH9/dWl/9ltMmK 6kpdueyk1p1X0sC+tXtmzTndu0oXGLoXh5mtHfiei0PQ9+3zRfXLJtQ9G7RZ5H+tQWeH386qj W//lUXxOR24KPHzFbJ8nwrIf3KnpVSE6T4bL5ZeBn8nWh84toqAx2Ff7nLHZSe/N/icts4Ifu 6ZDHjRumblo5e4rnn965ZNZ3pv+Di3l25S/1Mp/97KvOl6s7M3PzDH9+pbb+/ZP+1G15GL746 NLeZNrBF3l4xfVXjNfkmm633HSqzU+9uuTft+9a03w+UWIozEg21mIuKEwEAthkzgAMAAA== X-Env-Sender: leimaohui@fujitsu.com X-Msg-Ref: server-3.tower-565.messagelabs.com!1641543915!60249!1 X-Originating-IP: [62.60.8.84] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.81.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3462 invoked from network); 7 Jan 2022 08:25:15 -0000 Received: from unknown (HELO mailhost3.uk.fujitsu.com) (62.60.8.84) by server-3.tower-565.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Jan 2022 08:25:15 -0000 Received: from R01UKEXCASM126.r01.fujitsu.local ([10.183.43.178]) by mailhost3.uk.fujitsu.com (8.14.5/8.14.5) with ESMTP id 2078P7vk004314 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Fri, 7 Jan 2022 08:25:15 GMT Received: from localhost.localdomain (10.167.225.227) by R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Fri, 7 Jan 2022 08:25:08 +0000 From: Lei Maohui To: CC: Lei Maohui Subject: [oe] [PATCH 1/3] dstat: Deleted terminated project. Date: Sat, 8 Jan 2022 01:24:55 +0800 Message-ID: <1641576297-3341-2-git-send-email-leimaohui@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1641576297-3341-1-git-send-email-leimaohui@fujitsu.com> References: <1641576297-3341-1-git-send-email-leimaohui@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.227] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) 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, 07 Jan 2022 08:25:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94680 Please reference to https://github.com/dstat-real/dstat. Signed-off-by: Lei Maohui --- .../dstat/0001-change-dstat-to-python3.patch | 89 ------------------- meta-oe/recipes-support/dstat/dstat_0.7.4.bb | 24 ----- 2 files changed, 113 deletions(-) delete mode 100644 meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch delete mode 100644 meta-oe/recipes-support/dstat/dstat_0.7.4.bb diff --git a/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch b/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch deleted file mode 100644 index 06a8498f3c..0000000000 --- a/meta-oe/recipes-support/dstat/dstat/0001-change-dstat-to-python3.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ce0528cb48666843fed2ad10ece5ecb0ac0b8cf8 Mon Sep 17 00:00:00 2001 -From: Zheng Ruoqin -Date: Fri, 15 May 2020 12:38:49 +0900 -Subject: [PATCH] change dstat to python3. - -Signed-off-by: Zheng Ruoqin ---- - dstat | 2 +- - examples/curstest | 2 +- - examples/devtest.py | 2 +- - examples/mmpipe.py | 2 +- - examples/mstat.py | 2 +- - examples/read.py | 2 +- - examples/tdbtest | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/dstat b/dstat -index 9359965..f250f06 100755 ---- a/dstat -+++ b/dstat -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - ### This program is free software; you can redistribute it and/or - ### modify it under the terms of the GNU General Public License -diff --git a/examples/curstest b/examples/curstest -index afc4e70..d720cca 100755 ---- a/examples/curstest -+++ b/examples/curstest -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import curses, sys - - #c = curses.wrapper(s) -diff --git a/examples/devtest.py b/examples/devtest.py -index 0e9e969..e53babd 100755 ---- a/examples/devtest.py -+++ b/examples/devtest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - import sys - sys.path.insert(0, '/usr/share/dstat/') -diff --git a/examples/mmpipe.py b/examples/mmpipe.py -index 5c93567..f91515f 100755 ---- a/examples/mmpipe.py -+++ b/examples/mmpipe.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import select, sys, os - - def readpipe(file, tmout = 0.001): -diff --git a/examples/mstat.py b/examples/mstat.py -index abf4d07..ac157e4 100755 ---- a/examples/mstat.py -+++ b/examples/mstat.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - ### Example2: simple sub-second monitor (ministat) - -diff --git a/examples/read.py b/examples/read.py -index 556b7ae..a925109 100755 ---- a/examples/read.py -+++ b/examples/read.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - ### Example 1: Direct accessing stats - ### This is a quick example showing how you can access dstat data -diff --git a/examples/tdbtest b/examples/tdbtest -index 528a8ea..ae7fef9 100755 ---- a/examples/tdbtest -+++ b/examples/tdbtest -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - import sys, tdb - - db = tdb.tdb('/var/cache/samba/connections.tdb') --- -2.17.1 - diff --git a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb b/meta-oe/recipes-support/dstat/dstat_0.7.4.bb deleted file mode 100644 index bc73f639bd..0000000000 --- a/meta-oe/recipes-support/dstat/dstat_0.7.4.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "versatile resource statics tool" -DESCRIPTION = "Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat. \ -Dstat overcomes some of their limitations and adds some extra features, more counters \ -and flexibility. Dstat is handy for monitoring systems during performance tuning tests, \ -benchmarks or troubleshooting." -HOMEPAGE = "http://dag.wiee.rs/home-made/dstat" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS += "asciidoc-native xmlto-native" - -SRC_URI = "git://github.com/dagwieers/dstat.git;branch=master;protocol=https \ - file://0001-change-dstat-to-python3.patch \ - " - -SRCREV = "6f5db0aed26bf8cf2700d4ffe90a9bd3436ac728" - -S = "${WORKDIR}/git" - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" From patchwork Fri Jan 7 17:24:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maohui Lei (Fujitsu)" X-Patchwork-Id: 2117 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 0F2A7C433F5 for ; Fri, 7 Jan 2022 08:25:20 +0000 (UTC) Received: from mail1.bemta36.messagelabs.com (mail1.bemta36.messagelabs.com [85.158.142.2]) by mx.groups.io with SMTP id smtpd.web10.4197.1641543918909283408 for ; Fri, 07 Jan 2022 00:25:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=tPWCSLGu; spf=pass (domain: fujitsu.com, ip: 85.158.142.2, mailfrom: leimaohui@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1641543916; i=@fujitsu.com; bh=lH0I3o+iOJoyBaT0LwYndsfrvNw5zAXElh9SYGa7Py4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tPWCSLGuckhUm/MtMKfpU5wqIeC45phOZRHEg8gB2KAExpHI80ij+H6tUMpyOWh+N L6L0/L5DL0zy/sdA2DhxXRP9zbQeZbY9gU8YBR3ISOyB6tTzuNEbPkgVtan0EMCY2+ +tidfBImG2rIq7VWVTQfXOlsMZWKwf/BqMgMJFjnmujFTj7uezDODmERJXYHZSfadD SjwYZAps2ANH+zsggYII2mC0YgDQgIOD60OgTKo/oUlnFCOS3j7jL6li9s54Bv23i6 vOffnQwG3p1zU85tNOaa1OusOwjeHbgvs5xXOFR9Qno2pYhKknmplrshNuvgIbbUyP lyjyxKKBoaXKw== Received: from [100.115.64.141] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-2.bemta.az-a.eu-central-1.aws.ess.symcld.net id A0/90-24146-CE8F7D16; Fri, 07 Jan 2022 08:25:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCIsWRWlGSWpSXmKPExsViZ8MRovvmx/V Eg1leFhcPL2V2YPQ4t3EFYwBjFGtmXlJ+RQJrxpubk5kLrotVHJj1j72BsUOki5GLQ0hgBpNE Q08fK4Szh1Hi2Z35zF2MnBxsAhoSu6deBrNFBPQlls7eA2YzC6hJHH35E8jm4BAW8Je4/kUHJ MwioCLx6nsfWAmvgItE17MZ7CC2hICCxJSH78HinAKuErNv3mQCsYWAaib9hbB5BQQlTs58wg IxXkLi4IsXzBC9ShJvL+1hhLArJGbNamOawMg/C0nLLCQtCxiZVjHaJRVlpmeU5CZm5ugaGhj oGhqa6pob6hoaG+slVukm6qWW6ian5pUUJQKl9RLLi/VSi4v1iitzk3NS9PJSSzYxAgMzpdi9 dQfj5b6feocYJTmYlER5xd9dTxTiS8pPqcxILM6ILyrNSS0+xCjDwaEkwbvkFlBOsCg1PbUiL TMHGCUwaQkOHiURXpaPQGne4oLE3OLMdIjUKUZFKXHeou9ACQGQREZpHlwbLDIvMcpKCfMyMj AwCPEUpBblZpagyr9iFOdgVBLmzQKZwpOZVwI3/RXQYiagxSuEwRaXJCKkpBqYzvYkLHBa+NT ulFzJZNm3Juvkw64+jLW4+YWv0HAmn6Lxs/qTvkuMmjQe/N83KTfr+B7TeQdrbbP+2/4UnMBq suTJ0ti3uYfadFwuTM2eFtTvcP+NcFeC0EqVTae99hTW79t7yEx2adHaBRXcapu1udmCTNL/O BWtVgvqDPp7pHzhDX4N1blGwmFvMt15LPaJfGffu1Xp597kNZ+O3sq5syTm6z4tSYdd9aIcxV OWPVlzzjyhep/offHjxW0zd709zbz0ZZbtv+rY0POfbh2xC59cc2S1WOb3jzv1vB9vktqz/e4 +btZPf2pnXn1u7eb4hV2pPtc3ea6eXnl3R3q2nMfW/iVTlnvusTnAUHCgUYmlOCPRUIu5qDgR AOQmLuNHAwAA X-Env-Sender: leimaohui@fujitsu.com X-Msg-Ref: server-20.tower-528.messagelabs.com!1641543915!59318!1 X-Originating-IP: [62.60.8.84] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.81.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31427 invoked from network); 7 Jan 2022 08:25:15 -0000 Received: from unknown (HELO mailhost3.uk.fujitsu.com) (62.60.8.84) by server-20.tower-528.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Jan 2022 08:25:15 -0000 Received: from R01UKEXCASM126.r01.fujitsu.local ([10.183.43.178]) by mailhost3.uk.fujitsu.com (8.14.5/8.14.5) with ESMTP id 2078P7vl004314 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Fri, 7 Jan 2022 08:25:15 GMT Received: from localhost.localdomain (10.167.225.227) by R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Fri, 7 Jan 2022 08:25:09 +0000 From: Lei Maohui To: CC: Lei Maohui Subject: [oe] [PATCH 2/3] dool: Added a new OSS that forked from dstat project. Date: Sat, 8 Jan 2022 01:24:56 +0800 Message-ID: <1641576297-3341-3-git-send-email-leimaohui@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1641576297-3341-1-git-send-email-leimaohui@fujitsu.com> References: <1641576297-3341-1-git-send-email-leimaohui@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.227] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) 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, 07 Jan 2022 08:25:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94681 Please referece to https://github.com/dstat-real/dstat. Signed-off-by: Lei Maohui --- .../0001-Fix-build-error-as-following.patch | 39 +++++++++++++++++++ meta-oe/recipes-support/dool/dool_1.0.0.bb | 24 ++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch create mode 100644 meta-oe/recipes-support/dool/dool_1.0.0.bb diff --git a/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch b/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch new file mode 100644 index 0000000000..2324af4997 --- /dev/null +++ b/meta-oe/recipes-support/dool/dool/0001-Fix-build-error-as-following.patch @@ -0,0 +1,39 @@ +From e81feec1ebbc676220cd8759d83f46335602d079 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Fri, 7 Jan 2022 14:37:36 +0900 +Subject: [PATCH] Fix build error as following: + +*** No rule to make target 'dstat.1', needed by 'docs'. Stop. + +Upstream-Status: Pending + +Signed-off-by: Lei Maohui +--- + docs/Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/Makefile b/docs/Makefile +index c031e82..1a85e61 100644 +--- a/docs/Makefile ++++ b/docs/Makefile +@@ -11,13 +11,13 @@ all: + + dist: docs + +-docs: dstat.1 $(htmltargets) ++docs: dool.1 $(htmltargets) + +-install: dstat.1 +- install -Dp -m0644 dstat.1 $(DESTDIR)$(mandir)/man1/dstat.1 ++install: dool.1 ++ install -Dp -m0644 dool.1 $(DESTDIR)$(mandir)/man1/dool.1 + + clean: +- rm -f dstat.1 *.html *.xml ++ rm -f dool.1 *.html *.xml + + %.1.html: %.1.adoc + asciidoc -d manpage $< +-- +2.25.1 + diff --git a/meta-oe/recipes-support/dool/dool_1.0.0.bb b/meta-oe/recipes-support/dool/dool_1.0.0.bb new file mode 100644 index 0000000000..0cbc32ff3c --- /dev/null +++ b/meta-oe/recipes-support/dool/dool_1.0.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "versatile resource statics tool" +DESCRIPTION = "Dstat is a versatile replacement for vmstat, iostat, netstat and ifstat. \ +Dstat overcomes some of their limitations and adds some extra features, more counters \ +and flexibility. Dstat is handy for monitoring systems during performance tuning tests, \ +benchmarks or troubleshooting." +HOMEPAGE = "http://dag.wiee.rs/home-made/dstat" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS += "asciidoc-native xmlto-native" + +SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ + file://0001-Fix-build-error-as-following.patch \ + " + +SRCREV = "34a3244b46aa70a31f871a7ca8ffa8d3a7b950d2" + +S = "${WORKDIR}/git" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell python3-six python3-unixadmin" From patchwork Fri Jan 7 17:24:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maohui Lei (Fujitsu)" X-Patchwork-Id: 2118 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 0CBA0C433EF for ; Fri, 7 Jan 2022 08:25:20 +0000 (UTC) Received: from mail1.bemta32.messagelabs.com (mail1.bemta32.messagelabs.com [195.245.230.65]) by mx.groups.io with SMTP id smtpd.web11.4038.1641543918288486769 for ; Fri, 07 Jan 2022 00:25:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=k4FEwCuc; spf=pass (domain: fujitsu.com, ip: 195.245.230.65, mailfrom: leimaohui@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1641543916; i=@fujitsu.com; bh=hRs7leUJKQY8NyLvBhcjf9G1oESgYomRM/H/tZUNyFY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=k4FEwCucRDNvIMWtTnlTcdX/Ad3hhZ0GcbpW/q91+gCuGWu8SgMhqRO8tkwmVyK/x sER62+SboItEtHTjj+gJeofK7LOXDv8wGBk628ja026WbD1JFYl6DENsVcIu7oxDXx xmtQ/8oINXdvjTHRoexwYeL6pDseqMFkcyWtdm8h0M/1hpwF4E2hTsPea1QC4JSwBR 3UtfQfabYH75SQF4ozlYFkiLhA9+R0KeTco95zgT7jT8Bgusob9FYPkLC4CH3TzkRR qduwq8dbGqLK29/mWXv3i49CX1vGWrDOgCaViiIkb3YOUPUyQ1DfhXkhPBNmamW524 d5woBX4Ugvd1g== Received: from [100.115.3.123] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-3.bemta.az-a.eu-west-1.aws.ess.symcld.net id 72/46-13695-CE8F7D16; Fri, 07 Jan 2022 08:25:16 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRWlGSWpSXmKPExsViZ8MRovv6x/V EgzP3bCwuHl7K7MDocW7jCsYAxijWzLyk/IoE1oxTsycyFrzNrGh6OI2xgfFnZBcjF4eQwAwm ifbnW9khnD2MEh8//WfpYuTkYBPQkNg99TIziC0ioC+xdPYeMJtZQE3i6MufYLawgL/Esv0TG LsYOThYBFQkmtbygYR5BVwkXq26wg5iSwgoSEx5+B6snFPAVWL2zZtMILYQUM2kvxA2r4CgxM mZT1ggxktIHHzxghmiV0ni7aU9jBB2hcSsWW1MExj5ZyFpmYWkZQEj0ypGq6SizPSMktzEzBx dQwMDXUNDU10TIMtQL7FKN1EvtVS3PLW4RBfILS/WSy0u1iuuzE3OSdHLSy3ZxAgMyZRiltQd jH19P/UOMUpyMCmJ8oq/u54oxJeUn1KZkVicEV9UmpNafIhRhoNDSYJ3yS2gnGBRanpqRVpmD jA+YNISHDxKIrwCwBgR4i0uSMwtzkyHSJ1iVJQS5/3/HSghAJLIKM2Da4PF5CVGWSlhXkYGBg YhnoLUotzMElT5V4ziHIxKwrzLQKbwZOaVwE1/BbSYCWjxCmGwxSWJCCmpBqa+hnNzd078e9x 6QWvE8/NzSyIvNxvezz59KHuewasZ0eZvGJ6rSVRM/DfZaeeCBfmXxHn7Wp/72E0XCcidfCTx bcOyY2r5s67YKRsdk1flmPpzosXZ/iUvlq2t4avImpIh4vZ/C7uwrGbgw+PnDe+LnU+M3to44 0BNt9r8mZJzT3W1FuT+OCna43vkF8esr+zfd9eyb3WZInA5m/9vUqXEypkXw21PlB7v2Lly7l 0uL6dteipZQuW2Do1b5b0zXlxQMzzZquTuvVLicvgu3kj562Jv303i8DYXY0x41vVy6ekepZ1 sbxVmbr9mslk2eGWfaZHcJXaz7t8pVQn3VsRzlVZfWdGtGcC9+W7U/ONKLMUZiYZazEXFiQCK AC73RAMAAA== X-Env-Sender: leimaohui@fujitsu.com X-Msg-Ref: server-11.tower-591.messagelabs.com!1641543915!75331!1 X-Originating-IP: [62.60.8.84] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.81.7; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30223 invoked from network); 7 Jan 2022 08:25:15 -0000 Received: from unknown (HELO mailhost3.uk.fujitsu.com) (62.60.8.84) by server-11.tower-591.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Jan 2022 08:25:15 -0000 Received: from R01UKEXCASM126.r01.fujitsu.local ([10.183.43.178]) by mailhost3.uk.fujitsu.com (8.14.5/8.14.5) with ESMTP id 2078P7vm004314 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL) for ; Fri, 7 Jan 2022 08:25:15 GMT Received: from localhost.localdomain (10.167.225.227) by R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Fri, 7 Jan 2022 08:25:11 +0000 From: Lei Maohui To: CC: Lei Maohui Subject: [oe] [PATCH 3/3] pcp: Added a new recipe which provides dstat command. Date: Sat, 8 Jan 2022 01:24:57 +0800 Message-ID: <1641576297-3341-4-git-send-email-leimaohui@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1641576297-3341-1-git-send-email-leimaohui@fujitsu.com> References: <1641576297-3341-1-git-send-email-leimaohui@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.227] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM126.r01.fujitsu.local (10.183.43.178) 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, 07 Jan 2022 08:25:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94679 Performance Co-Pilot is a system performance analysis toolkit - Collect performance metrics from your systems efficiently. - Analyze systems' performance metrics in real-time or using historical data. - Extend the collected performance metrics in a simple way. Signed-off-by: Lei Maohui --- .../recipes-support/pcp/pcp-native_5.3.5.bb | 49 ++++ meta-oe/recipes-support/pcp/pcp.inc | 32 +++ ...ove-unsuitble-part-for-cross-compile.patch | 45 ++++ meta-oe/recipes-support/pcp/pcp/config.linux | 13 ++ meta-oe/recipes-support/pcp/pcp_5.3.5.bb | 217 ++++++++++++++++++ 5 files changed, 356 insertions(+) create mode 100644 meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb create mode 100644 meta-oe/recipes-support/pcp/pcp.inc create mode 100644 meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch create mode 100644 meta-oe/recipes-support/pcp/pcp/config.linux create mode 100644 meta-oe/recipes-support/pcp/pcp_5.3.5.bb diff --git a/meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb b/meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb new file mode 100644 index 0000000000..029a47531b --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp-native_5.3.5.bb @@ -0,0 +1,49 @@ +require pcp.inc +inherit python3native native +#autotools-brokensep +DEPENDS = "python3-native python3-setuptools-native flex-native bison-native" + +export PCP_DIR = "${D}" +export PCP_TMP_DIR = "${D}/tmp" +export PCP_BIN_DIR = "${D}/usr/bin" + +B = "${S}" + +do_configure:prepend() { + export SED=${TMPDIR}/hosttools/sed + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 + + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + +} +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + + export AR=${TMPDIR}/hosttools/ar +# export PYTHON=python3 +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + oe_runmake install \ + PCP_ETC_DIR=${D}/${sysconfdir} \ + PCP_SYSCONF_DIR=${D}/${sysconfdir} \ + PCP_VAR_DIR=${D}/${localstatedir} \ + PCP_SHARE_DIR=${D}/${datadir} \ + PCP_BIN_DIR=${D}/${bindir} \ + PCP_BINADM_DIR=${D}/${libexecdir}/pcp/bin \ + PCP_LIBADM_DIR=${D}/${libdir} \ + PCP_LIB_DIR=${D}/${libdir} \ + PCP_MAN_DIR=${D}/${mandir} \ + PCP_DOC_DIR=${D}/${docdir} +} + diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc new file mode 100644 index 0000000000..f6f111b0e8 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp.inc @@ -0,0 +1,32 @@ +SUMMARY = "System-level performance monitoring and performance management" +HOMEPAGE = "http://www.pcp.io" +SECTION = "Applications/System" + +LICENSE = "GPLv2+ & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \ + " +COMPATIBLE_HOST:libc-musl = "null" + +SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/pcp-5.3.5.src.tar.gz \ + file://config.linux \ + " + +SRC_URI[sha256sum] = "589a610f753a49af6d2015cede87e9d469bd07880ebef26fe1607b6ded375e97" + +inherit distutils3-base pkgconfig autotools + +B = "${S}" + +# Specify any options you want to pass to the configure script using EXTRA_OECONF: +CACHED_CONFIGUREVARS = "PACKAGE_DISTRIBUTION=arch" +EXTRA_OECONF:append = " --with-dstat-symlink=yes --with-infiniband=no \ + --with-pmdapodman=no --with-python=no --with-python3=yes --with-perl=no \ + --with-pmdabcc=no --with-pmdajson=no --with-perfevent=no \ + --with-pmdabcc=yes \ + --with-rundir=${localstatedir}/run \ + --with-sysconfigdir=${sysconfdir} \ + --with-logdir=${localstatedir}/log \ + --with-docdir=${docdir} \ + " + + diff --git a/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch new file mode 100644 index 0000000000..292499850e --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/0001-Remove-unsuitble-part-for-cross-compile.patch @@ -0,0 +1,45 @@ +From db9e6a4b7a48dee62fccb662347dd638a2d286d5 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Thu, 2 Dec 2021 14:29:06 +0900 +Subject: [PATCH] Remove unsuitble part for cross-compile. + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Lei Maohui +--- + configure.ac | 6 ------ + src/libpcp/src/GNUmakefile | 1 - + 2 files changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5b25382..5d24714 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -623,12 +623,6 @@ fi + which=$WHICH + AC_SUBST(which) + +-if test -z "$AR"; then +- AC_PATH_PROGS(AR, [gcc-ar ar], /usr/bin/ar) +-fi +-if test ! -x "$AR"; then +- AC_MSG_ERROR([cannot find a valid 'ar' command.]) +-fi + ar=$AR + AC_SUBST(ar) + +diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile +index 3c4ccd6..d1eba19 100644 +--- a/src/libpcp/src/GNUmakefile ++++ b/src/libpcp/src/GNUmakefile +@@ -176,7 +176,6 @@ exports: exports.in mk.exports + # cases + # + check.done: $(OBJECTS) +- ./check-statics + touch check.done + + ifneq ($(LIBTARGET),) +-- +2.25.1 + diff --git a/meta-oe/recipes-support/pcp/pcp/config.linux b/meta-oe/recipes-support/pcp/pcp/config.linux new file mode 100644 index 0000000000..191f87acc6 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp/config.linux @@ -0,0 +1,13 @@ +sizeof_int=4 +sizeof_long=4 +sizeof_pointer=8 +sizeof_suseconds_t=8 +sizeof_time_t=8 +bit_field_scheme=2100 +enable_python3='yes' +enable_python3='true' +have_python_OrderedDict="true" +have_python=python3 +printf_p_prefix=0x +printf_fmt_int64=I64d +strtoint64=strtoll diff --git a/meta-oe/recipes-support/pcp/pcp_5.3.5.bb b/meta-oe/recipes-support/pcp/pcp_5.3.5.bb new file mode 100644 index 0000000000..e6c139e1d3 --- /dev/null +++ b/meta-oe/recipes-support/pcp/pcp_5.3.5.bb @@ -0,0 +1,217 @@ +require pcp.inc +#inherit perlnative + +# NOTE: the following prog dependencies are unknown, ignoring: gtar gzip pkgmk xmlto lzma qshape md5sum pod2man publican git makedepend qmake-qt4 xconfirm true gmake xz dblatex hdiutil rpm bzip2 which mkinstallp dtrace seinfo qmake-qt5 gawk dlltool rpmbuild dpkg makepkg qmake echo +# NOTE: unable to map the following pkg-config dependencies: libmicrohttpd libsystemd-journal +# (this is based on recipes that have previously been built and packaged) +# NOTE: the following library dependencies are unknown, ignoring: nspr gen ibumad regex sasl2 pfm nss papi ibmad +# (this is based on recipes that have previously been built and packaged) +DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptools python3 \ + pcp-native cairo zlib ncurses readline libx11 avahi openssl" + + +SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ + " + +export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" +#export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" +EXTRA_OEMAKE = "CC="${CC}" LD="${LD}" AR="${AR}"" +inherit useradd systemd + +SYSTEMD_AUTO_ENABLE:${PN} = "enable" +SYSTEMD_SERVICE:${PN} = "pmcd.service pmcd.service pmie_check.service pmie_farm_check.service \ + pmlogger_daily.service pmlogger_farm_check.service pmfind.service \ + pmie_daily.service pmlogger.service pmlogger_daily_report.service \ + pmproxy.service pmie.service pmie_farm.service pmlogger_check.service \ + pmlogger_farm.service" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home ${localstatedir}/lib/pcp --no-create-home \ + --user-group pcp" + +USERADD_PACKAGES = "${PN}-testsuite" +USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsuite --no-create-home \ + --user-group pcpqa" + +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-testsuite += "${PN} bash perl" +RDEPENDS:python3-${PN} += "${PN} python3" + +do_configure:prepend () { + cp ${WORKDIR}/config.linux ${B} + rm -rf ${S}/include/pcp/configsz.h + rm -rf ${S}/include/pcp/platformsz.h + export SED=${TMPDIR}/hosttools/sed + export PYTHON=python3 +} + +do_compile:prepend() { + sed -i -e "s,#undef HAVE_64BIT_LONG,,g" \ + -e "s,#undef HAVE_64BIT_PTR,,g" \ + -e "s,#undef PM_SIZEOF_SUSECONDS_T,,g" \ + -e "s,#undef PM_SIZEOF_TIME_T,,g" \ + ${S}/src/include/pcp/config.h.in + sed -i -e "s,HAVE_PYTHON_ORDEREDDICT = false,HAVE_PYTHON_ORDEREDDICT = true,g" \ + ${S}/src/include/builddefs + sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile + export PYTHON=python3 + #export PYTHON3=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} +} + +do_compile() { + oe_runmake default_pcp +} + +do_install () { + export NO_CHOWN=true + oe_runmake install DIST_ROOT=${D}\ + install_pcp + + rm -rf ${D}${localstatedir}/log + rm -rf ${D}${localstatedir}/lib/pcp/pmcd + rm -rf ${D}${localstatedir}/lib/pcp/tmp + rm -rf ${D}${localstatedir}/run + mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/ + mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/ + sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf + sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf +} + +PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ + libpcp-gui2 libpcp-gui2-dev \ + libpcp-import1 \ + libpcp-mmv1 libpcp-mmv1-dev \ + libpcp-pmda3 libpcp-pmda3-dev \ + libpcp-trace2 libpcp-trace2-dev \ + libpcp-web1 libpcp-web1-dev \ + libpcp3 libpcp3-dev python3-${PN}\ +" +FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ +" +FILES:libpcp-gui2-dev = " \ + ${libdir}/libpcp_gui.so \ + ${libdir}/libpcp_gui.a \ + ${includedir}/pmafm.h \ + ${includedir}/pmtime.h \ +" +FILES:libpcp-mmv1 = " \ + ${libdir}/libpcp_mmv.so.1 \ +" +FILES:libpcp-mmv1-dev = " \ + ${libdir}/libpcp_mmv.a \ + ${libdir}/libpcp_mmv.so \ + ${libdir}/libpcp_mmv.so \ + ${includedir}/mmv_stats.h \ + ${includedir}/mmv_dev.h \ + ${datadir}/man/man3/mmv_* \ + ${datadir}/man/man5/mmv.5.gz \ +" +FILES:libpcp-import1 = " \ + ${libdir}/libpcp_import.so.1 \ +" +FILES:libpcp-pmda3 = " \ + ${libdir}/libpcp_pmda.so.3 \ +" +FILES:libpcp-pmda3-dev = " \ + ${includedir}/pmda.h \ + ${includedir}/pmdaroot.h \ + ${libdir}/libpcp_pmda.a \ + ${libdir}/libpcp_pmda.so \ + ${libdir}/pkgconfig/libpcp_pmda.pc \ + ${datadir}/man/man3/PMDA.3.gz \ + ${datadir}/man/man3/pmda* \ +" +FILES:libpcp-trace2 = " \ + ${libdir}/libpcp_trace.so.2 \ +" +FILES:libpcp-trace2-dev = " \ + ${includedir}/trace.h \ + ${includedir}/trace_dev.h \ + ${libdir}/libpcp_trace.a \ + ${libdir}/libpcp_trace.so \ + ${datadir}/man/man3/pmtrace* \ +" +FILES:libpcp-web1 = " \ + ${libdir}/libpcp_web.so.1 \ +" +FILES:libpcp-web1-dev = " \ + ${includedir}/pmhttp.h \ + ${includedir}/pmjson.h \ + ${libdir}/libpcp_web.a \ + ${libdir}/libpcp_web.so \ + ${datadir}/man/man3/pmhttp* \ + ${datadir}/man/man3/pmjson* \ +" +FILES:libpcp3 = " \ + ${libdir}/libpcp.so.3 \ +" + +FILES:${PN} = " \ + ${sysconfdir}/pcp \ + ${libexecdir} \ + ${bindir} \ + ${datadir}/bash-completion \ + ${datadir}/pcp-gui \ + ${datadir}/zsh \ + ${systemd_system_unitdir}/ \ + ${libdir}/pcp/ \ + ${datadir}/pcp \ + ${libdir}/*.sh \ + ${datadir}/man \ + ${libdir}/rc-proc.sh.minimal \ + ${sysconfdir}/p* \ + ${sysconfdir}/s* \ + ${localstatedir}/lib/pcp/config \ + ${localstatedir}/lib/pcp/pmdas/ \ + ${localstatedir}/lib/pcp/pmns \ + ${libdir}/libpcp_fault.so.3 \ +" + +FILES:${PN}-export-zabbix-agent += " \ + ${libdir}/zabbix \ + ${sysconfdir}/zabbix \ + ${mandir}/man3/zbxpcp.3.gz \ + ${libdir}/zabbix \ +" +FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/" +FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-dev += " \ + ${includedir}/pcp \ + ${libdir}/libpcp.a \ + ${libdir}/libpcp.so \ + ${localstatedir}/lib/pcp/pmdas/*/*.so \ + ${libexecdir}/pcp/bin/install-sh \ + ${libdir}/pkgconfig/libpcp.pc \ + ${libdir}/zabbix/modules/*.so \ + ${datadir}/man/man3/LOGIMPORT.3.gz \ + ${datadir}/man/man3/P* \ + ${datadir}/man/man3/Q* \ + ${datadir}/man/man3/__pm* \ + ${datadir}/man/man3/pmA* \ + ${datadir}/man/man3/pmC* \ + ${datadir}/man/man3/pmD* \ + ${datadir}/man/man3/pmE* \ + ${datadir}/man/man3/pmF* \ + ${datadir}/man/man3/pmG* \ + ${datadir}/man/man3/pmH* \ + ${datadir}/man/man3/pmI* \ + ${datadir}/man/man3/pmL* \ + ${datadir}/man/man3/pmM* \ + ${datadir}/man/man3/pmN* \ + ${datadir}/man/man3/pmO* \ + ${datadir}/man/man3/pmP* \ + ${datadir}/man/man3/pmR* \ + ${datadir}/man/man3/pmS* \ + ${datadir}/man/man3/pmT* \ + ${datadir}/man/man3/pmU* \ + ${datadir}/man/man3/pmW* \ + ${datadir}/man/man3/pmf* \ + ${datadir}/man/man3/pmg* \ + ${datadir}/man/man3/pmi* \ + ${datadir}/man/man3/pms* \ + ${datadir}/man/man3/pmt* \ +"