Hello community, here is the log from the commit of package bootchart for openSUSE:Factory checked in at Mon Mar 15 12:13:42 CET 2010. -------- --- bootchart/bootchart.changes 2010-03-10 14:53:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/bootchart/bootchart.changes 2010-03-15 10:59:13.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 15 09:59:05 UTC 2010 - coolo@novell.com + +- make it work on factory's initrd + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fix-factory.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bootchart.spec ++++++ --- /var/tmp/diff_new_pack.taDbIz/_old 2010-03-15 12:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.taDbIz/_new 2010-03-15 12:13:38.000000000 +0100 @@ -37,11 +37,12 @@ Group: Development/Tools/Other Summary: Boot Process Charting Application Version: 2.%{real_bootchart2_version} -Release: 2 +Release: 3 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: bootchart2-%{real_bootchart2_version}.tar.bz2 Source3: mkinitrd-boot.sh Source4: mkinitrd-setup.sh +Patch0: fix-factory.diff AutoReqProv: on Requires: acct %system_requires Requires(post): mkinitrd @@ -52,6 +53,7 @@ %prep %setup -q -n bootchart2-%{real_bootchart2_version} +%patch0 -p1 %build export PY_LIBDIR=%py_libdir ++++++ fix-factory.diff ++++++ Index: bootchart2-0.0.9/bootchartd =================================================================== --- bootchart2-0.0.9.orig/bootchartd +++ bootchart2-0.0.9/bootchartd @@ -82,7 +82,7 @@ start() # the collector will just keep # running with no-one to stop it, so bail here. if [ "$JAIL" == "$JAIL_INITRD" ]; then - if ! grep -q init=/sbin/bootchartd proc/cmdline; then + if ! /bin/grep -q init=/sbin/bootchartd proc/cmdline; then echo "aborting initrd bootchart setup - init not set." umount proc return @@ -94,15 +94,14 @@ start() echo "bootchartd init" >> kmsg if [ "`uname -m`" = "x86_64" ] then - mkdir $JAIL/lib64 - cp /lib64/ld-linux-x86-64.so.* $JAIL/lib64 + mkdir -p $JAIL/lib64 + cp /lib64/ld-linux-x86-64.so.* /lib64/libc.so.* $JAIL/lib64 else mkdir -p $JAIL/lib - cp /lib/ld-linux.so.* $JAIL/lib + cp /lib/ld-linux.so.* /lib/libc.so.* $JAIL/lib fi - cp /lib/libc.so.* $JAIL/lib - mkdir $JAIL/lib/bootchart + mkdir -p $JAIL/lib/bootchart cp /lib/bootchart/bootchart-collector $JAIL/lib/bootchart fi @@ -121,7 +120,7 @@ start() # Otherwise start in a chroot jail elif [ -n "$IN_INIT" ]; then - chroot $JAIL /lib/bootchart/bootchart-collector -p proc $SAMPLE_HZ # 2>/dev/null & + /bin/chroot $JAIL /lib/bootchart/bootchart-collector -p proc $SAMPLE_HZ # Otherwise, manually launched to profile something else @@ -165,7 +164,7 @@ wait_boot() if [ -n "$exit_proc" -a -n "$( pidof $exit_proc )" ]; then # give an unambiguous settle afterwards - so we get # more post-login data for slow systems - sleep 20 + /bin/sleep 20 # Write / flush the log files stop @@ -275,10 +274,10 @@ if [ $$ -eq 1 ]; then else # running inside the main system echo "acute oddness - why can't we detect this !?" >> /dev/kmsg ls -al /dev >> /dev/kmsg - if [ -c /dev/.bootchart/kmsg ]; then + if [ -c $JAIL_INITRD/kmsg ]; then echo "bootchart - has kmsg" >> /dev/kmsg fi - if [ -d /dev/.bootchart ]; then + if [ -d $JAIL_INITRD ]; then echo "bootchart: start wait for completion" >> /dev/kmsg wait_boot & else # perhaps we had no initrd ++++++ mkinitrd-boot.sh ++++++ --- /var/tmp/diff_new_pack.taDbIz/_old 2010-03-15 12:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.taDbIz/_new 2010-03-15 12:13:38.000000000 +0100 @@ -2,10 +2,7 @@ # #%stage: setup #%provides: killprogs -#%programs: /sbin/bootchartd /sbin/accton sleep usleep mv tar gzip hostname uname grep mknod chroot +#%programs: /sbin/bootchartd /sbin/accton /bin/sleep /bin/usleep mv tar /bin/gzip hostname uname /bin/grep mknod chroot #%if: "$bootchart" #%dontshow # -# if test "$init" == "/sbin/init"; then -# init=/sbin/bootchartd -# fi ++++++ mkinitrd-setup.sh ++++++ --- /var/tmp/diff_new_pack.taDbIz/_old 2010-03-15 12:13:38.000000000 +0100 +++ /var/tmp/diff_new_pack.taDbIz/_new 2010-03-15 12:13:38.000000000 +0100 @@ -10,7 +10,8 @@ sed -e "s,.lock,/.lock," /etc/bootchartd.conf > etc/bootchartd.conf cp /etc/SuSE-release etc/ touch etc/inittab - cp -a /lib/bootchart lib + mkdir -p lib + cp -a /lib/bootchart/ lib/ mknod -m 0666 dev/null c 1 3 bootchart=1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org