[arch-commits] Commit in munin-node/repos (3 files)
Dan McGee
dan at archlinux.org
Tue Nov 3 04:18:34 UTC 2009
Date: Monday, November 2, 2009 @ 23:18:34
Author: dan
Revision: 57983
Merged revisions 57982 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/munin-node/trunk
........
r57982 | dan | 2009-11-02 22:18:14 -0600 (Mon, 02 Nov 2009) | 5 lines
Useless commit messages are useless
Adding a patch
........
Added:
munin-node/repos/extra-x86_64/cpu-plugin-no-max.diff
(from rev 57982, munin-node/trunk/cpu-plugin-no-max.diff)
Modified:
munin-node/repos/extra-x86_64/ (properties)
munin-node/repos/extra-x86_64/PKGBUILD
------------------------+
PKGBUILD | 9 ++++++---
cpu-plugin-no-max.diff | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 3 deletions(-)
Property changes on: munin-node/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /munin-node/trunk:1-57593
+ /munin-node/trunk:1-57982
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-11-03 04:18:14 UTC (rev 57982)
+++ extra-x86_64/PKGBUILD 2009-11-03 04:18:34 UTC (rev 57983)
@@ -3,7 +3,7 @@
# Contributor: Roberto Alsina <ralsina at kde.org>
pkgname=munin-node
pkgver=1.2.6
-pkgrel=14
+pkgrel=15
pkgdesc="A distributed monitoring/graphing agent"
arch=('i686' 'x86_64')
url="http://munin.projects.linpro.no/"
@@ -12,11 +12,13 @@
backup=(etc/munin/munin-node.conf etc/logrotate.d/munin-node)
install=munin-node.install
source=(http://downloads.sourceforge.net/sourceforge/munin/munin_$pkgver.tar.gz
- Makefile.config munin-node.init logrotate.munin-node iostat_partition)
+ Makefile.config munin-node.init logrotate.munin-node iostat_partition
+ cpu-plugin-no-max.diff)
build() {
cd $srcdir/munin-$pkgver
cp $srcdir/Makefile.config $srcdir/munin-$pkgver || exit 1
+ patch -Np0 < $srcdir/cpu-plugin-no-max.diff
make PREFIX='' || exit 1
}
@@ -38,4 +40,5 @@
'5f9b83e0c876821cf2b20012f7cb63f0'
'9551a2f7c0f0364fd1b7dd010675e47a'
'cdf139f2b6ae36852113f3411caa6e99'
- '12289ab5d062449eaa14376f927f5d26')
+ '12289ab5d062449eaa14376f927f5d26'
+ '4ef0ef2bdc0d3d8563935be13024957b')
Copied: munin-node/repos/extra-x86_64/cpu-plugin-no-max.diff (from rev 57982, munin-node/trunk/cpu-plugin-no-max.diff)
===================================================================
--- extra-x86_64/cpu-plugin-no-max.diff (rev 0)
+++ extra-x86_64/cpu-plugin-no-max.diff 2009-11-03 04:18:34 UTC (rev 57983)
@@ -0,0 +1,46 @@
+Index: /trunk/plugins/node.d.linux/cpu.in
+===================================================================
+--- node/node.d.linux/cpu.in (revision 2293)
++++ node/node.d.linux/cpu.in (revision 2352)
+@@ -94,5 +93,4 @@
+ echo 'system.label system'
+ echo 'system.draw AREA'
+- echo "system.max $MAX"
+ echo 'system.min 0'
+ echo 'system.type DERIVE'
+@@ -101,5 +99,4 @@
+ echo 'user.draw STACK'
+ echo 'user.min 0'
+- echo "user.max $MAX"
+ echo 'user.type DERIVE'
+ echo 'user.info CPU time spent by normal programs and daemons'
+@@ -107,5 +104,4 @@
+ echo 'nice.draw STACK'
+ echo 'nice.min 0'
+- echo "nice.max $MAX"
+ echo 'nice.type DERIVE'
+ echo 'nice.info CPU time spent by nice(1)d programs'
+@@ -113,5 +109,4 @@
+ echo 'idle.draw STACK'
+ echo 'idle.min 0'
+- echo "idle.max $MAX"
+ echo 'idle.type DERIVE'
+ echo 'idle.info Idle CPU time'
+@@ -133,5 +128,4 @@
+ echo 'iowait.draw STACK'
+ echo 'iowait.min 0'
+- echo "iowait.max $MAX"
+ echo 'iowait.type DERIVE'
+ echo 'iowait.info CPU time spent waiting for I/O operations to finish when there is nothing else to do.'
+@@ -139,5 +133,4 @@
+ echo 'irq.draw STACK'
+ echo 'irq.min 0'
+- echo "irq.max $MAX"
+ echo 'irq.type DERIVE'
+ echo 'irq.info CPU time spent handling interrupts'
+@@ -145,5 +138,4 @@
+ echo 'softirq.draw STACK'
+ echo 'softirq.min 0'
+- echo "softirq.max $MAX"
+ echo 'softirq.type DERIVE'
+ echo 'softirq.info CPU time spent handling "batched" interrupts'
More information about the arch-commits
mailing list