Hello community,
here is the log from the commit of package bootchart for openSUSE:Factory
checked in at Fri Jan 30 00:03:54 CET 2009.
--------
--- bootchart/bootchart.changes 2009-01-20 13:04:26.000000000 +0100
+++ bootchart/bootchart.changes 2009-01-29 20:58:46.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Jan 29 20:48:48 CET 2009 - coolo@suse.de
+
+- add grep to the list of programs and make it use bash
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bootchart.spec ++++++
--- /var/tmp/diff_new_pack.g31008/_old 2009-01-30 00:02:36.000000000 +0100
+++ /var/tmp/diff_new_pack.g31008/_new 2009-01-30 00:02:36.000000000 +0100
@@ -25,7 +25,7 @@
Group: Development/Tools/Other
Summary: Boot Process Charting Application
Version: 0.9
-Release: 289
+Release: 290
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%{version}.tar.bz2
Source1: commons-cli-1.0.jar
@@ -50,7 +50,7 @@
%prep
%setup -q
-%patch1
+%patch1 -p1
%patch2
%build
@@ -94,6 +94,8 @@
/lib/mkinitrd
%changelog
+* Thu Jan 29 2009 coolo@suse.de
+- add grep to the list of programs and make it use bash
* Tue Jan 20 2009 coolo@suse.de
- fix initrd profiling and fix autorender support
* Fri Aug 01 2008 coolo@suse.de
++++++ bootchart-0.9.diff ++++++
--- /var/tmp/diff_new_pack.g31008/_old 2009-01-30 00:02:36.000000000 +0100
+++ /var/tmp/diff_new_pack.g31008/_new 2009-01-30 00:02:36.000000000 +0100
@@ -1,11 +1,7 @@
-Index: script/bootchart
-===================================================================
-RCS file: /cvsroot/bootchart/bootchart/script/bootchart,v
-retrieving revision 1.3
-diff -u -3 -p -r1.3 bootchart
---- script/bootchart 13 Feb 2005 22:01:29 -0000 1.3
-+++ script/bootchart 11 Oct 2005 07:46:56 -0000
-@@ -13,8 +13,8 @@ fi
+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
+@@ -13,8 +13,8 @@
# Configuration
MAIN_CLASS="org.bootchart.Main"
@@ -16,117 +12,24 @@
# Set parameters
set_jvm
-Index: script/bootchartd
-===================================================================
-RCS file: /cvsroot/bootchart/bootchart/script/bootchartd,v
-retrieving revision 1.16
-diff -u -3 -p -r1.16 bootchartd
---- script/bootchartd 26 Sep 2005 09:38:47 -0000 1.16
-+++ script/bootchartd 11 Oct 2005 07:46:56 -0000
-@@ -43,7 +43,7 @@ start()
+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
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # Bootchart logger script
+ # Ziga Mahkovec
+@@ -45,7 +45,7 @@
# directory.
- LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXX 2>/dev/null )"
+ LOG_DIR="$( mktemp -d /tmp/bootchart.XXXXXX 2>/dev/null )"
if [ -z "$LOG_DIR" ]; then
- LOG_DIR="/mnt"
+ LOG_DIR="/lib/bootchart/mnt"
LAZY_UMOUNT="yes"
mount -n -t tmpfs -o size=$TMPFS_SIZE none "$LOG_DIR" >/dev/null 2>&1
fi
-@@ -122,7 +122,7 @@ wait_boot()
- 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"
- # 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"
-@@ -132,12 +132,12 @@ wait_boot()
- while [ -f "$BOOTLOG_LOCK" ]; do
- if [ -n "$( pidof $exit_proc )" ]; then
- # Give the exit process some time to start
-- sleep 5
-+ sleep 2
- # Flush the log files
- stop
- return
- fi
-- sleep 2
-+ usleep 300000
- done;
- }
-
-Index: script/bootchartd.conf
-===================================================================
-RCS file: /cvsroot/bootchart/bootchart/script/bootchartd.conf,v
-retrieving revision 1.6
-diff -u -3 -p -r1.6 bootchartd.conf
---- script/bootchartd.conf 26 Sep 2005 09:38:47 -0000 1.6
-+++ script/bootchartd.conf 11 Oct 2005 07:46:56 -0000
-@@ -16,7 +16,7 @@ SAMPLE_PERIOD=0.2
- # kernel needs to be configured to enable v3 accounting
- # (CONFIG_BSD_PROCESS_ACCT_V3). accton from the GNU accounting utilities
- # is also required.
--PROCESS_ACCOUNTING="no"
-+PROCESS_ACCOUNTING="yes"
-
- # Tarball for the various boot log files
- BOOTLOG_DEST=/var/log/bootchart.tgz
-@@ -24,7 +24,7 @@ BOOTLOG_DEST=/var/log/bootchart.tgz
- # Whether to automatically generate the boot chart once the boot logger
- # completes. The boot chart will be generated in /var/log/bootchart.png.
- # Note that the bootchart package must be installed.
--AUTO_RENDER="no"
-+AUTO_RENDER="yes"
-
- # Image format to use for the auto-generated boot chart
- # (choose between png, svg and eps).
---- script/bootchartd.orig 2007-06-19 19:35:21.850954000 +0200
-+++ script/bootchartd 2007-06-19 19:37:32.782890000 +0200
-@@ -121,7 +121,7 @@
- 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 xterm konsole gnome-terminal"
-+ local exit_proc="gdmgreeter gdm-binary kdm_greet xterm konsole gnome-terminal mingetty stopinitrd"
- # 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"
-@@ -131,7 +131,12 @@
- while [ -f "$BOOTLOG_LOCK" ]; do
- if [ -n "$( pidof $exit_proc )" ]; then
- # Give the exit process some time to start
-- sleep 2
-+ stopinitrd=$( pidof stopinitrd )
-+ if [ -n "$stopinitrd" ] ; then
-+ kill $stopinitrd
-+ else
-+ sleep 2
-+ fi
- # Flush the log files
- stop
- return
-@@ -166,6 +171,18 @@
- log_header
-
- # Package log files
-+ if test -f /dev/shm/bootchart.tgz; then
-+ mkdir shm
-+ cd shm
-+ tar xf /dev/shm/bootchart.tgz
-+ for i in *.log; do
-+ cat $i ../$i > $i.new && mv $i.new ../$i
-+ rm $i
-+ done
-+ cd ..
-+ rm /dev/shm/bootchart.tgz
-+ fi
-+
- tar -zcf "$BOOTLOG_DEST" header $pacct *.log
- if [ -z "$LAZY_UMOUNT" ]; then
- rm "$LOG_DIR"/*
---- script/bootchartd.orig 2007-06-19 23:06:33.000000000 +0200
-+++ script/bootchartd 2007-06-19 23:06:46.000000000 +0200
@@ -108,7 +108,7 @@
eval $cmd 2>/dev/null
echo
@@ -136,7 +39,12 @@
}
# Wait for the boot process to end.
-@@ -121,7 +121,7 @@
+@@ -117,22 +117,32 @@
+ 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"
# 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"
@@ -145,43 +53,44 @@
exit_proc="mingetty agetty rungetty getty"
fi
while [ -f "$BOOTLOG_LOCK" ]; do
-@@ -129,7 +129,11 @@
+ if [ -n "$( pidof $exit_proc )" ]; then
# Give the exit process some time to start
- stopinitrd=$( pidof stopinitrd )
- if [ -n "$stopinitrd" ] ; then
+- sleep 5
++ stopinitrd=$( pidof stopinitrd )
++ if [ -n "$stopinitrd" ] ; then
+ mv $LOG_DIR/* /dev/shm/
+ rm -f "$BOOTLOG_LOCK"
+ wait
- kill $stopinitrd
++ kill $stopinitrd
+ exit 0
- else
- sleep 2
- fi
-@@ -167,17 +171,12 @@
++ else
++ sleep 2
++ fi
+ # Flush the log files
++ killall blktrace
+ stop
+ return
+ fi
+- sleep 2
++ usleep 300000
+ done;
+ }
+
+@@ -162,6 +172,13 @@
log_header
# Package log files
-- if test -f /dev/shm/bootchart.tgz; then
-- mkdir shm
-- cd shm
-- tar xf /dev/shm/bootchart.tgz
-- for i in *.log; do
-- cat $i ../$i > $i.new && mv $i.new ../$i
-- rm $i
-- done
-- cd ..
-- rm /dev/shm/bootchart.tgz
-- fi
+ for i in *.log; do
+ if test -f /dev/shm/$i; then
+ cat /dev/shm/$i $i > $i.new && mv $i.new $i
+ rm /dev/shm/$i
+ fi
+ done
-
++
tar -zcf "$BOOTLOG_DEST" header $pacct *.log
if [ -z "$LAZY_UMOUNT" ]; then
-@@ -185,8 +185,10 @@
+ rm "$LOG_DIR"/*
+@@ -169,8 +186,10 @@
fi
# Render the chart if configured (and the renderer is installed)
@@ -193,3 +102,51 @@
}
+@@ -226,6 +245,13 @@
+ init="${i#*=}"
+ break
+ fi
++ if [ "${i%%=*}" = "init" ]; then
++ _init=${i#*=}
++ if test "$_init" != "/sbin/bootchartd"; then
++ init="$_init"
++ fi
++ break
++ fi
+ done
+ exec $init $*
+ 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
+@@ -16,7 +16,7 @@
+ # kernel needs to be configured to enable v3 accounting
+ # (CONFIG_BSD_PROCESS_ACCT_V3). accton from the GNU accounting utilities
+ # is also required.
+-PROCESS_ACCOUNTING="no"
++PROCESS_ACCOUNTING="yes"
+
+ # Tarball for the various boot log files
+ BOOTLOG_DEST=/var/log/bootchart.tgz
+@@ -24,7 +24,7 @@
+ # Whether to automatically generate the boot chart once the boot logger
+ # completes. The boot chart will be generated in $AUTO_RENDER_DIR.
+ # Note that the bootchart package must be installed.
+-AUTO_RENDER="no"
++AUTO_RENDER="yes"
+
+ # 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
++++++ mkinitrd-boot.sh ++++++
--- /var/tmp/diff_new_pack.g31008/_old 2009-01-30 00:02:36.000000000 +0100
+++ /var/tmp/diff_new_pack.g31008/_new 2009-01-30 00:02:36.000000000 +0100
@@ -3,7 +3,7 @@
#%stage: setup
#%provides: killprogs
#%depends: killblogd2
-#%programs: /sbin/bootchartd /sbin/accton sleep usleep mv tar /bin/gzip hostname uname
+#%programs: /sbin/bootchartd /sbin/accton sleep usleep mv tar /bin/gzip hostname uname /bin/grep
#%if: "$bootchart"
#%dontshow
#
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org