From 7676c2b38e649b294bc1332839b3c3a26489dd34 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 5 Nov 2007 17:36:00 +0000 Subject: Move ubootchart to meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3072 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/ubootchart/files/pass-args.patch | 21 ------------ .../packages/ubootchart/files/sysvinit.patch | 12 ------- .../packages/ubootchart/files/ubootchart-stop | 3 -- .../packages/ubootchart/files/ubootchart.desktop | 6 ---- meta-extras/packages/ubootchart/ubootchart_svn.bb | 38 ---------------------- meta/packages/ubootchart/files/pass-args.patch | 21 ++++++++++++ meta/packages/ubootchart/files/sysvinit.patch | 12 +++++++ meta/packages/ubootchart/files/ubootchart-stop | 3 ++ meta/packages/ubootchart/files/ubootchart.desktop | 6 ++++ meta/packages/ubootchart/ubootchart_svn.bb | 38 ++++++++++++++++++++++ 10 files changed, 80 insertions(+), 80 deletions(-) delete mode 100644 meta-extras/packages/ubootchart/files/pass-args.patch delete mode 100644 meta-extras/packages/ubootchart/files/sysvinit.patch delete mode 100644 meta-extras/packages/ubootchart/files/ubootchart-stop delete mode 100644 meta-extras/packages/ubootchart/files/ubootchart.desktop delete mode 100644 meta-extras/packages/ubootchart/ubootchart_svn.bb create mode 100644 meta/packages/ubootchart/files/pass-args.patch create mode 100644 meta/packages/ubootchart/files/sysvinit.patch create mode 100644 meta/packages/ubootchart/files/ubootchart-stop create mode 100644 meta/packages/ubootchart/files/ubootchart.desktop create mode 100644 meta/packages/ubootchart/ubootchart_svn.bb diff --git a/meta-extras/packages/ubootchart/files/pass-args.patch b/meta-extras/packages/ubootchart/files/pass-args.patch deleted file mode 100644 index 9ad4282f2..000000000 --- a/meta-extras/packages/ubootchart/files/pass-args.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: ubootchartd -=================================================================== ---- ubootchartd (revision 9) -+++ ubootchartd (working copy) -@@ -7,9 +7,11 @@ - # can read. - . /etc/ubootchart/ubootchart.conf - --#################################################### --# Now start capturing the stats: --#################################################### --/sbin/ubootchartd_bin & --exec $init_prog -+if [ $$ -eq 1 ]; then -+ #################################################### -+ # Now start capturing the stats: -+ #################################################### -+ /sbin/ubootchartd_bin & -+fi - -+exec $init_prog "$@" diff --git a/meta-extras/packages/ubootchart/files/sysvinit.patch b/meta-extras/packages/ubootchart/files/sysvinit.patch deleted file mode 100644 index de9fb0b17..000000000 --- a/meta-extras/packages/ubootchart/files/sysvinit.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: ubootchart.conf -=================================================================== ---- ubootchart.conf (revision 9) -+++ ubootchart.conf (working copy) -@@ -1,6 +1,6 @@ - - # If you want to chain on and run somthing other than /sbin/init... --export init_prog=/sbin/init -+export init_prog=/sbin/init.sysvinit - - # On startup ubootchart will mount a tmpfs filesystem at this - # location and chdir here. This is only used for the logging of diff --git a/meta-extras/packages/ubootchart/files/ubootchart-stop b/meta-extras/packages/ubootchart/files/ubootchart-stop deleted file mode 100644 index 3444069c9..000000000 --- a/meta-extras/packages/ubootchart/files/ubootchart-stop +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -kill -USR1 $(pidof ubootchartd_bin) diff --git a/meta-extras/packages/ubootchart/files/ubootchart.desktop b/meta-extras/packages/ubootchart/files/ubootchart.desktop deleted file mode 100644 index 5552b3bc6..000000000 --- a/meta-extras/packages/ubootchart/files/ubootchart.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=/sbin/ubootchart-stop -Name=Stop Bootchart -Type=Application -Categories=Programming; diff --git a/meta-extras/packages/ubootchart/ubootchart_svn.bb b/meta-extras/packages/ubootchart/ubootchart_svn.bb deleted file mode 100644 index 7ab485c58..000000000 --- a/meta-extras/packages/ubootchart/ubootchart_svn.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "A boot profiling tool" -HOMEPAGE = "http://code.google.com/p/ubootchart/" -LICENSE = "GPLv3" -PV = "0.0+r${SRCREV}" -PR = "r2" - -RRECOMMENDS = "acct" - -SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \ - file://sysvinit.patch;patch=1;pnum=0 \ - file://pass-args.patch;patch=1;pnum=0 \ - file://ubootchart-stop \ - file://ubootchart.desktop" - -S = "${WORKDIR}/trunk" - -inherit update-alternatives - -ALTERNATIVE_NAME = "init" -ALTERNATIVE_LINK = "${base_sbindir}/init" -ALTERNATIVE_PATH = "${base_sbindir}/ubootchartd" -ALTERNATIVE_PRIORITY = "20" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} ${INCLUDES} ${S}/ubootchartd_bin.c -o ubootchartd_bin -} - -do_install() { - install -m 0755 -d ${D}/sbin ${D}/etc/ubootchart ${D}/usr/share/applications - install -m 0755 ${S}/ubootchartd_bin ${D}/sbin - install -m 0755 ${S}/ubootchartd ${D}/sbin - install -m 0644 ${S}/ubootchart.conf ${D}/etc/ubootchart - install -m 0755 ${S}/start.sh ${D}/etc/ubootchart - install -m 0755 ${S}/finish.sh ${D}/etc/ubootchart - - install -m 0755 ${WORKDIR}/ubootchart-stop ${D}/sbin - install -m 0644 ${WORKDIR}/ubootchart.desktop ${D}/usr/share/applications -} diff --git a/meta/packages/ubootchart/files/pass-args.patch b/meta/packages/ubootchart/files/pass-args.patch new file mode 100644 index 000000000..9ad4282f2 --- /dev/null +++ b/meta/packages/ubootchart/files/pass-args.patch @@ -0,0 +1,21 @@ +Index: ubootchartd +=================================================================== +--- ubootchartd (revision 9) ++++ ubootchartd (working copy) +@@ -7,9 +7,11 @@ + # can read. + . /etc/ubootchart/ubootchart.conf + +-#################################################### +-# Now start capturing the stats: +-#################################################### +-/sbin/ubootchartd_bin & +-exec $init_prog ++if [ $$ -eq 1 ]; then ++ #################################################### ++ # Now start capturing the stats: ++ #################################################### ++ /sbin/ubootchartd_bin & ++fi + ++exec $init_prog "$@" diff --git a/meta/packages/ubootchart/files/sysvinit.patch b/meta/packages/ubootchart/files/sysvinit.patch new file mode 100644 index 000000000..de9fb0b17 --- /dev/null +++ b/meta/packages/ubootchart/files/sysvinit.patch @@ -0,0 +1,12 @@ +Index: ubootchart.conf +=================================================================== +--- ubootchart.conf (revision 9) ++++ ubootchart.conf (working copy) +@@ -1,6 +1,6 @@ + + # If you want to chain on and run somthing other than /sbin/init... +-export init_prog=/sbin/init ++export init_prog=/sbin/init.sysvinit + + # On startup ubootchart will mount a tmpfs filesystem at this + # location and chdir here. This is only used for the logging of diff --git a/meta/packages/ubootchart/files/ubootchart-stop b/meta/packages/ubootchart/files/ubootchart-stop new file mode 100644 index 000000000..3444069c9 --- /dev/null +++ b/meta/packages/ubootchart/files/ubootchart-stop @@ -0,0 +1,3 @@ +#! /bin/sh + +kill -USR1 $(pidof ubootchartd_bin) diff --git a/meta/packages/ubootchart/files/ubootchart.desktop b/meta/packages/ubootchart/files/ubootchart.desktop new file mode 100644 index 000000000..5552b3bc6 --- /dev/null +++ b/meta/packages/ubootchart/files/ubootchart.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/sbin/ubootchart-stop +Name=Stop Bootchart +Type=Application +Categories=Programming; diff --git a/meta/packages/ubootchart/ubootchart_svn.bb b/meta/packages/ubootchart/ubootchart_svn.bb new file mode 100644 index 000000000..7ab485c58 --- /dev/null +++ b/meta/packages/ubootchart/ubootchart_svn.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "A boot profiling tool" +HOMEPAGE = "http://code.google.com/p/ubootchart/" +LICENSE = "GPLv3" +PV = "0.0+r${SRCREV}" +PR = "r2" + +RRECOMMENDS = "acct" + +SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \ + file://sysvinit.patch;patch=1;pnum=0 \ + file://pass-args.patch;patch=1;pnum=0 \ + file://ubootchart-stop \ + file://ubootchart.desktop" + +S = "${WORKDIR}/trunk" + +inherit update-alternatives + +ALTERNATIVE_NAME = "init" +ALTERNATIVE_LINK = "${base_sbindir}/init" +ALTERNATIVE_PATH = "${base_sbindir}/ubootchartd" +ALTERNATIVE_PRIORITY = "20" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} ${INCLUDES} ${S}/ubootchartd_bin.c -o ubootchartd_bin +} + +do_install() { + install -m 0755 -d ${D}/sbin ${D}/etc/ubootchart ${D}/usr/share/applications + install -m 0755 ${S}/ubootchartd_bin ${D}/sbin + install -m 0755 ${S}/ubootchartd ${D}/sbin + install -m 0644 ${S}/ubootchart.conf ${D}/etc/ubootchart + install -m 0755 ${S}/start.sh ${D}/etc/ubootchart + install -m 0755 ${S}/finish.sh ${D}/etc/ubootchart + + install -m 0755 ${WORKDIR}/ubootchart-stop ${D}/sbin + install -m 0644 ${WORKDIR}/ubootchart.desktop ${D}/usr/share/applications +} -- cgit v1.2.3