[bootchart/f15] update to latest git fixed write bug Resolves: rhbz#699934
Harald Hoyer
harald at fedoraproject.org
Thu Jun 30 12:42:49 UTC 2011
commit f4d9eeaf333957f7ef70292340dadaccc91063f3
Author: Harald Hoyer <harald at redhat.com>
Date: Thu Jun 30 14:01:30 2011 +0200
update to latest git
fixed write bug
Resolves: rhbz#699934
...mport-path-so-we-can-call-them-from-sourc.patch | 3 +-
...e-parsing-tests-for-ParserState-Trace-cha.patch | 3 +-
...tgui-support-hp-smart-arrays-block-device.patch | 27 ++++++++++++++++++++
...-pybootchartgui-fix-hp-smart-array-regexp.patch | 23 +++++++++++++++++
...Look-for-bootchart_init-in-the-environmen.patch | 25 ++++++++++++++++++
...ybootchartgui-main.py-fix-output-filename.patch | 2 +-
...gui-main.py.in-catch-IOError-and-print-er.patch | 23 -----------------
...tgui-main.py.in-set-default-format-to-png.patch | 2 +-
....py-_parse_proc_stat_log-skip-empty-lines.patch | 4 +-
...ove-to-run-bootchart-instead-of-dev-.boot.patch | 2 +-
bootchart.spec | 21 +++++++++++----
11 files changed, 99 insertions(+), 36 deletions(-)
---
diff --git a/0003-Fix-tests-import-path-so-we-can-call-them-from-sourc.patch b/0003-Fix-tests-import-path-so-we-can-call-them-from-sourc.patch
index 967fde4..fa0d516 100644
--- a/0003-Fix-tests-import-path-so-we-can-call-them-from-sourc.patch
+++ b/0003-Fix-tests-import-path-so-we-can-call-them-from-sourc.patch
@@ -1,7 +1,8 @@
From 9539ad4a591a8dac88b7ffe5a60280bced769ec5 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date: Sat, 19 Mar 2011 11:03:43 +0100
-Subject: [PATCH] Fix tests import path so we can call them from source root dir
+Subject: [PATCH] Fix tests import path so we can call them from source root
+ dir
---
pybootchartgui/tests/parser_test.py | 3 ++-
diff --git a/0004-tests-update-parsing-tests-for-ParserState-Trace-cha.patch b/0004-tests-update-parsing-tests-for-ParserState-Trace-cha.patch
index af31ba4..1cfd9be 100644
--- a/0004-tests-update-parsing-tests-for-ParserState-Trace-cha.patch
+++ b/0004-tests-update-parsing-tests-for-ParserState-Trace-cha.patch
@@ -1,7 +1,8 @@
From ac66b2e49d0d1ad80e6c0246d900653880572c1c Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date: Sat, 19 Mar 2011 12:01:47 +0100
-Subject: [PATCH] tests: update parsing tests for ParserState() -> Trace() change
+Subject: [PATCH] tests: update parsing tests for ParserState() -> Trace()
+ change
---
pybootchartgui/tests/parser_test.py | 22 ++++++++++++++--------
diff --git a/0010-pybootchartgui-support-hp-smart-arrays-block-device.patch b/0010-pybootchartgui-support-hp-smart-arrays-block-device.patch
new file mode 100644
index 0000000..bf65f69
--- /dev/null
+++ b/0010-pybootchartgui-support-hp-smart-arrays-block-device.patch
@@ -0,0 +1,27 @@
+From 93b5ca86d5a5af349ed34b007c44c7a20ce9150a Mon Sep 17 00:00:00 2001
+From: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
+Date: Sun, 22 May 2011 17:26:00 +0200
+Subject: [PATCH] pybootchartgui: support hp smart arrays block device
+
+This is a port of Anders Noorgard and Brian Murray patch at
+lp #723663
+
+I've changed the patch to match any device and not just the
+first one. Also i'd like to note that we were not crashing :)
+---
+ pybootchartgui/parsing.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pybootchartgui/parsing.py b/pybootchartgui/parsing.py
+index 56648d5..48a5c23 100644
+--- a/pybootchartgui/parsing.py
++++ b/pybootchartgui/parsing.py
+@@ -402,7 +402,7 @@ def _parse_proc_disk_stat_log(file, numCpu):
+ not sda1, sda2 etc. The format of relevant lines should be:
+ {major minor name rio rmerge rsect ruse wio wmerge wsect wuse running use aveq}
+ """
+- disk_regex_re = re.compile ('^([hsv]d.|mtdblock\d|mmcblk\d)$')
++ disk_regex_re = re.compile ('^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+)$')
+
+ # this gets called an awful lot.
+ def is_relevant_line(linetokens):
diff --git a/0011-pybootchartgui-fix-hp-smart-array-regexp.patch b/0011-pybootchartgui-fix-hp-smart-array-regexp.patch
new file mode 100644
index 0000000..3d12e2d
--- /dev/null
+++ b/0011-pybootchartgui-fix-hp-smart-array-regexp.patch
@@ -0,0 +1,23 @@
+From db81210459452b3d08af96d1af33d46b341d3d86 Mon Sep 17 00:00:00 2001
+From: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
+Date: Sun, 22 May 2011 17:40:56 +0200
+Subject: [PATCH] pybootchartgui: fix hp smart array regexp
+
+/me needs to double check before pushing
+---
+ pybootchartgui/parsing.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pybootchartgui/parsing.py b/pybootchartgui/parsing.py
+index 48a5c23..9e261f5 100644
+--- a/pybootchartgui/parsing.py
++++ b/pybootchartgui/parsing.py
+@@ -402,7 +402,7 @@ def _parse_proc_disk_stat_log(file, numCpu):
+ not sda1, sda2 etc. The format of relevant lines should be:
+ {major minor name rio rmerge rsect ruse wio wmerge wsect wuse running use aveq}
+ """
+- disk_regex_re = re.compile ('^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+)$')
++ disk_regex_re = re.compile ('^([hsv]d.|mtdblock\d|mmcblk\d|cciss/c\d+d\d+.*)$')
+
+ # this gets called an awful lot.
+ def is_relevant_line(linetokens):
diff --git a/0012-bootchartd-Look-for-bootchart_init-in-the-environmen.patch b/0012-bootchartd-Look-for-bootchart_init-in-the-environmen.patch
new file mode 100644
index 0000000..96b7844
--- /dev/null
+++ b/0012-bootchartd-Look-for-bootchart_init-in-the-environmen.patch
@@ -0,0 +1,25 @@
+From 130d775e230636f2e15cd7f766bec7a84d6b2461 Mon Sep 17 00:00:00 2001
+From: Henry Gebhardt <hsggebhardt at googlemail.com>
+Date: Sat, 28 May 2011 01:22:16 +0200
+Subject: [PATCH] bootchartd: Look for bootchart_init in the environment
+
+According to bootparam(7) kernel parameters of the form "foo=bar" are
+passed as environment variables, which is also what I observe on Linux
+2.6.39. This patch fixes bootchartd to look for bootchart_init there,
+too.
+---
+ bootchartd.in | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/bootchartd.in b/bootchartd.in
+index ebe9d8b..173b473 100755
+--- a/bootchartd.in
++++ b/bootchartd.in
+@@ -172,6 +172,7 @@ if [ $$ -eq 1 ]; then
+
+ # Optionally, an alternative init(1) process may be specified using
+ # the kernel command line (e.g. "bootchart_init=/sbin/initng")
++ [ -n "$bootchart_init" ] && init="$bootchart_init"
+ for i in $@; do
+ if [ "${i%%=*}" = "bootchart_init" ]; then
+ init="${i#*=}"
diff --git a/0010-pybootchartgui-main.py-fix-output-filename.patch b/0013-pybootchartgui-main.py-fix-output-filename.patch
similarity index 92%
rename from 0010-pybootchartgui-main.py-fix-output-filename.patch
rename to 0013-pybootchartgui-main.py-fix-output-filename.patch
index 4494565..ca9f1b9 100644
--- a/0010-pybootchartgui-main.py-fix-output-filename.patch
+++ b/0013-pybootchartgui-main.py-fix-output-filename.patch
@@ -1,4 +1,4 @@
-From 1a74e9cf71e8e74f5387f1d36abc9a9b16eecd11 Mon Sep 17 00:00:00 2001
+From 60ba6355b1f2a5b0c3944ae1ff6021452edf34f3 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 18 Feb 2011 13:52:37 +0100
Subject: [PATCH] pybootchartgui/main.py: fix output filename
diff --git a/0011-pybootchartgui-main.py.in-set-default-format-to-png.patch b/0014-pybootchartgui-main.py.in-set-default-format-to-png.patch
similarity index 94%
rename from 0011-pybootchartgui-main.py.in-set-default-format-to-png.patch
rename to 0014-pybootchartgui-main.py.in-set-default-format-to-png.patch
index 64664b9..05ff2e5 100644
--- a/0011-pybootchartgui-main.py.in-set-default-format-to-png.patch
+++ b/0014-pybootchartgui-main.py.in-set-default-format-to-png.patch
@@ -1,4 +1,4 @@
-From f6c5c9ab94ba076a6ba1623448cafe2f1305be7c Mon Sep 17 00:00:00 2001
+From c5317097b05375d268b3ba9abbc70bd32b63f66a Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 18 Feb 2011 13:54:11 +0100
Subject: [PATCH] pybootchartgui/main.py.in: set default format to png
diff --git a/0012-parsing.py-_parse_proc_stat_log-skip-empty-lines.patch b/0015-parsing.py-_parse_proc_stat_log-skip-empty-lines.patch
similarity index 88%
rename from 0012-parsing.py-_parse_proc_stat_log-skip-empty-lines.patch
rename to 0015-parsing.py-_parse_proc_stat_log-skip-empty-lines.patch
index 028431b..1d21e65 100644
--- a/0012-parsing.py-_parse_proc_stat_log-skip-empty-lines.patch
+++ b/0015-parsing.py-_parse_proc_stat_log-skip-empty-lines.patch
@@ -1,4 +1,4 @@
-From 7dcd5ad5537dcc24136c21728b3c997f884785fd Mon Sep 17 00:00:00 2001
+From 460e8b11fc492a6dfa2198c9a7abe034fcfdd8f2 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Fri, 18 Feb 2011 14:01:00 +0100
Subject: [PATCH] parsing.py: _parse_proc_stat_log() skip empty lines
@@ -8,7 +8,7 @@ Subject: [PATCH] parsing.py: _parse_proc_stat_log() skip empty lines
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/pybootchartgui/parsing.py b/pybootchartgui/parsing.py
-index 56648d5..f4b76e5 100644
+index 9e261f5..576ee9c 100644
--- a/pybootchartgui/parsing.py
+++ b/pybootchartgui/parsing.py
@@ -380,6 +380,9 @@ def _parse_proc_stat_log(file):
diff --git a/0014-collector-move-to-run-bootchart-instead-of-dev-.boot.patch b/0016-collector-move-to-run-bootchart-instead-of-dev-.boot.patch
similarity index 94%
rename from 0014-collector-move-to-run-bootchart-instead-of-dev-.boot.patch
rename to 0016-collector-move-to-run-bootchart-instead-of-dev-.boot.patch
index e9b40bf..913a452 100644
--- a/0014-collector-move-to-run-bootchart-instead-of-dev-.boot.patch
+++ b/0016-collector-move-to-run-bootchart-instead-of-dev-.boot.patch
@@ -1,4 +1,4 @@
-From c348507b51777273554980e433ccaa3827ede53a Mon Sep 17 00:00:00 2001
+From bad93a68a3041ebe38e0953f998d00f49fb08e66 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 31 Mar 2011 14:01:39 +0200
Subject: [PATCH] collector: move to /run/bootchart instead of /dev/.bootchart
diff --git a/bootchart.spec b/bootchart.spec
index 4ce3c49..e9f7021 100644
--- a/bootchart.spec
+++ b/bootchart.spec
@@ -2,7 +2,7 @@
Name: bootchart
Version: 0.14.0
-Release: 1.2.git20110331%{?dist}
+Release: 1.3.git20110630%{?dist}
Summary: Boot Process Performance Visualization
License: GPLv2+ and GPLv3+
URL: https://github.com/mmeeks/bootchart
@@ -16,11 +16,13 @@ Patch6: 0006-tests-remove-unuseful-testParseLogDir.patch
Patch7: 0007-tests-update-for-Trace-and-ProcessTree-api-changes.patch
Patch8: 0008-Add-Makefile-target-for-executing-pybootchartgui-tes.patch
Patch9: 0009-Fix-self-reference-in-bootchartd-SEE-ALSO-section-ma.patch
-Patch10: 0010-pybootchartgui-main.py-fix-output-filename.patch
-Patch11: 0011-pybootchartgui-main.py.in-set-default-format-to-png.patch
-Patch12: 0012-parsing.py-_parse_proc_stat_log-skip-empty-lines.patch
-Patch13: 0013-pybootchartgui-main.py.in-catch-IOError-and-print-er.patch
-Patch14: 0014-collector-move-to-run-bootchart-instead-of-dev-.boot.patch
+Patch10: 0010-pybootchartgui-support-hp-smart-arrays-block-device.patch
+Patch11: 0011-pybootchartgui-fix-hp-smart-array-regexp.patch
+Patch12: 0012-bootchartd-Look-for-bootchart_init-in-the-environmen.patch
+Patch13: 0013-pybootchartgui-main.py-fix-output-filename.patch
+Patch14: 0014-pybootchartgui-main.py.in-set-default-format-to-png.patch
+Patch15: 0015-parsing.py-_parse_proc_stat_log-skip-empty-lines.patch
+Patch16: 0016-collector-move-to-run-bootchart-instead-of-dev-.boot.patch
Group: Applications/System
BuildRequires: python
@@ -61,6 +63,8 @@ file.
%patch12 -p1 -b .git12
%patch13 -p1 -b .git13
%patch14 -p1 -b .git14
+%patch15 -p1 -b .git15
+%patch16 -p1 -b .git16
%build
make CFLAGS="$RPM_OPT_FLAGS"
@@ -133,6 +137,11 @@ fi
%{_mandir}/man1/bootchartd.1*
%changelog
+* Thu Jun 30 2011 Harald Hoyer <harald at redhat.com> 0.14.0-1.3.git20110630
+- update to latest git
+- fixed write bug
+Resolves: rhbz#699934
+
* Thu Apr 07 2011 Harald Hoyer <harald at redhat.com> 0.14.0-1.2.git20110331
- fixed output filename
More information about the scm-commits
mailing list