Hello community, here is the log from the commit of package bootchart for openSUSE:Factory checked in at Tue Apr 7 12:44:55 CEST 2009. -------- --- bootchart/bootchart.changes 2009-02-06 21:23:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/bootchart/bootchart.changes 2009-04-06 15:51:26.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 6 15:51:11 CEST 2009 - coolo@suse.de + +- don't kill stapio and blktrace +- redo diff + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootchart.spec ++++++ --- /var/tmp/diff_new_pack.V20587/_old 2009-04-07 12:42:21.000000000 +0200 +++ /var/tmp/diff_new_pack.V20587/_new 2009-04-07 12:42:21.000000000 +0200 @@ -25,7 +25,7 @@ Group: Development/Tools/Other Summary: Boot Process Charting Application Version: 0.9 -Release: 291 +Release: 292 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%{version}.tar.bz2 Source1: commons-cli-1.0.jar @@ -94,6 +94,9 @@ /lib/mkinitrd %changelog +* Mon Apr 06 2009 coolo@suse.de +- don't kill stapio and blktrace +- redo diff * Fri Feb 06 2009 coolo@suse.de - show status of threads too - only overwrite init if it's default ++++++ bootchart-0.9.diff ++++++ --- /var/tmp/diff_new_pack.V20587/_old 2009-04-07 12:42:21.000000000 +0200 +++ /var/tmp/diff_new_pack.V20587/_new 2009-04-07 12:42:21.000000000 +0200 @@ -1,6 +1,6 @@ diff -ru bootchart-0.9/script/bootchart bootchart-0.9.new//script/bootchart --- bootchart-0.9/script/bootchart 2005-11-13 18:40:01.000000000 +0100 -+++ bootchart-0.9.new//script/bootchart 2009-01-23 16:11:01.000000000 +0100 ++++ bootchart-0.9.new//script/bootchart 2009-04-06 13:26:22.831250526 +0200 @@ -13,8 +13,8 @@ # Configuration @@ -14,7 +14,7 @@ set_jvm diff -ru bootchart-0.9/script/bootchartd bootchart-0.9.new//script/bootchartd --- bootchart-0.9/script/bootchartd 2005-11-13 18:40:01.000000000 +0100 -+++ bootchart-0.9.new//script/bootchartd 2009-01-23 16:12:00.000000000 +0100 ++++ bootchart-0.9.new//script/bootchartd 2009-04-06 13:27:17.491214771 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash @@ -30,6 +30,15 @@ LAZY_UMOUNT="yes" mount -n -t tmpfs -o size=$TMPFS_SIZE none "$LOG_DIR" >/dev/null 2>&1 fi +@@ -71,7 +71,7 @@ + # /proc/diskstats is available in 2.6 kernels + [ -f /proc/diskstats ] && log_output "cat /proc/diskstats" proc_diskstats.log & + +- log_output "cat /proc/*/stat" proc_ps.log & ++ log_output "cat /proc/*/task/*/stat" proc_ps.log & + #log_output "ps -eww -o pid,ppid,s,pcpu,comm,cmd" ps.log & + + if [ -n "$IN_INIT" ]; then @@ -108,7 +108,7 @@ eval $cmd 2>/dev/null echo @@ -39,12 +48,12 @@ } # Wait for the boot process to end. -@@ -117,22 +117,32 @@ +@@ -117,22 +117,31 @@ local runlevel=$( sed -n 's/.*:\(.*\):initdefault:.*/\1/gp' /etc/inittab ) # The processes we have to wait for - local exit_proc="gdmgreeter gdm-binary kdm_greet kdm" -+ local exit_proc="gdmgreeter gdm-binary kdm_greet xterm konsole gnome-terminal mingetty stopinitrd icewm" ++ local exit_proc="gdmgreeter gdm-binary kdm_greet xterm konsole gnome-terminal mingetty stopinitrd icewm-session" # early_login in FC4 starts gdm early, so fall back to mingetty local early_login="no" grep -q early_login /proc/cmdline && early_login="yes" @@ -67,16 +76,15 @@ + sleep 2 + fi # Flush the log files -+ killall blktrace stop return fi - sleep 2 -+ usleep 300000 ++ usleep 200000 done; } -@@ -162,6 +172,13 @@ +@@ -162,6 +171,13 @@ log_header # Package log files @@ -90,7 +98,7 @@ tar -zcf "$BOOTLOG_DEST" header $pacct *.log if [ -z "$LAZY_UMOUNT" ]; then rm "$LOG_DIR"/* -@@ -169,8 +186,10 @@ +@@ -169,8 +185,10 @@ fi # Render the chart if configured (and the renderer is installed) @@ -102,7 +110,7 @@ } -@@ -226,6 +245,13 @@ +@@ -226,6 +244,13 @@ init="${i#*=}" break fi @@ -118,7 +126,7 @@ fi diff -ru bootchart-0.9/script/bootchartd.conf bootchart-0.9.new//script/bootchartd.conf --- bootchart-0.9/script/bootchartd.conf 2005-11-13 18:40:01.000000000 +0100 -+++ bootchart-0.9.new//script/bootchartd.conf 2009-01-23 16:11:01.000000000 +0100 ++++ bootchart-0.9.new//script/bootchartd.conf 2009-04-06 13:26:22.831250526 +0200 @@ -16,7 +16,7 @@ # kernel needs to be configured to enable v3 accounting # (CONFIG_BSD_PROCESS_ACCT_V3). accton from the GNU accounting utilities @@ -137,37 +145,3 @@ # Image format to use for the auto-generated boot chart # (choose between png, svg and eps). -Nur in bootchart-0.9.new//script: bootchartd.conf.orig. -Nur in bootchart-0.9.new//script: bootchartd.orig. -diff -ru bootchart-0.9.new//script/bootchartd bootchart-0.9/script/bootchartd ---- bootchart-0.9.new//script/bootchartd 2009-01-23 16:12:00.000000000 +0100 -+++ bootchart-0.9/script/bootchartd 2009-01-25 21:39:46.000000000 +0100 -@@ -139,6 +139,7 @@ - fi - # Flush the log files - killall blktrace -+ killall stapio - stop - return - fi -diff -ru bootchart-0.9/script/bootchartd bootchart-0.9.new//script/bootchartd ---- bootchart-0.9/script/bootchartd 2009-01-25 21:39:46.000000000 +0100 -+++ bootchart-0.9.new//script/bootchartd 2009-02-03 10:14:26.000000000 +0100 -@@ -71,7 +71,7 @@ - # /proc/diskstats is available in 2.6 kernels - [ -f /proc/diskstats ] && log_output "cat /proc/diskstats" proc_diskstats.log & - -- log_output "cat /proc/*/stat" proc_ps.log & -+ log_output "cat /proc/*/task/*/stat" proc_ps.log & - #log_output "ps -eww -o pid,ppid,s,pcpu,comm,cmd" ps.log & - - if [ -n "$IN_INIT" ]; then -@@ -143,7 +143,7 @@ - stop - return - fi -- usleep 300000 -+ usleep 200000 - done; - } - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org