summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/bootchart/README15
-rw-r--r--system/bootchart/bootchart.SlackBuild16
-rw-r--r--system/bootchart/bootchart.info4
-rw-r--r--system/bootchart/mkchartrd15
4 files changed, 40 insertions, 10 deletions
diff --git a/system/bootchart/README b/system/bootchart/README
index a4b281b7ab..ee6d81dc4b 100644
--- a/system/bootchart/README
+++ b/system/bootchart/README
@@ -10,8 +10,15 @@ svg, eps).
This requires apache-ant, and you need the jdk package from /extra installed.
-After installation, to run bootchartd append the following boot option:
+
+After installation, to run bootchartd;
+a) if you run a huge kernel or custom kernel without initrd:
+append the following boot option:
init=/sbin/bootchartd
-You may want to edit your lilo configuration file. Also note that this will
-not work if run from a kernel using an initrd - you must use one of the
-huge* kernels (or a custom kernel).
+
+b) If you run a kernel using initrd:
+Run the script mkchartd with proper options and append to lilo
+configuration file a new entry for bootchart specifying:
+ initrd /boot/initrd.chart.gz
+
+Remember to run lilo after applying changes.
diff --git a/system/bootchart/bootchart.SlackBuild b/system/bootchart/bootchart.SlackBuild
index e55632f12a..b72b1c0eec 100644
--- a/system/bootchart/bootchart.SlackBuild
+++ b/system/bootchart/bootchart.SlackBuild
@@ -4,12 +4,12 @@
# Written by Marco Cecchetti (mrc.ildp@gmail.com)
-# This is free software. It cames with no warranties.
+# This is free software. It comes with no warranties.
PRGNAM=bootchart
VERSION=${VERSION:-0.9}
-ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-1}
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -17,6 +17,12 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "x86_64" ]; then
+ LIBDIRSUFFIX="64"
+else
+ LIBDIRSUFFIX=""
+fi
+
set -e
rm -rf $PKG
@@ -40,7 +46,7 @@ cp bootchart.jar $PKG/usr/share/java/bootchart.jar
mkdir -p $PKG/usr/bin
cat << EOF > $PKG/usr/bin/$PRGNAM
#!/bin/sh
-PATH=$PATH:/usr/lib/java/bin
+PATH=\$PATH:/usr/lib${LIBDIRSUFFIX}/java/bin
exec java -jar /usr/share/java/bootchart.jar "\$@"
EOF
chmod 0755 $PKG/usr/bin/$PRGNAM
@@ -62,5 +68,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/bootchart/bootchart.info b/system/bootchart/bootchart.info
index fee4e47657..cc7e95272b 100644
--- a/system/bootchart/bootchart.info
+++ b/system/bootchart/bootchart.info
@@ -3,6 +3,8 @@ VERSION="0.9"
HOMEPAGE="http://www.bootchart.org/"
DOWNLOAD="http://downloads.sourceforge.net/bootchart/bootchart-0.9.tar.bz2"
MD5SUM="4be91177d19069e21beeb106f2f77dff"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Marco Cecchetti"
EMAIL="mrc.ildp@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/system/bootchart/mkchartrd b/system/bootchart/mkchartrd
new file mode 100644
index 0000000000..cdf9b602b9
--- /dev/null
+++ b/system/bootchart/mkchartrd
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+mkinitrd $@ -o /boot/initrd.chart.gz
+
+cd /boot
+sed -i s/"sbin\/init"/"sbin\/bootchartd"/g /boot/initrd-tree/init
+OPTIONS=`echo $@|sed s/"-c"/""/`
+
+mkinitrd $OPTIONS -o /boot/initrd.chart.gz
+
+
+
+