summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-11-06 08:54:47 (GMT)
committerRoss Burton <ross@openedhand.com>2007-11-06 08:54:47 (GMT)
commit3b6c384c0513d5a3f3665d81ea538c8f9d13ead1 (patch)
tree0dccffa1d43e0b6fd2e9f1ff11f13b9f5a4290e7 /meta
parent1ab9a482036a7a9314d47377c11f4478b9b77903 (diff)
downloadpoky-3b6c384c0513d5a3f3665d81ea538c8f9d13ead1.tar.gz
Pin ubootchart srcrev, and remove integrated patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3076 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf1
-rw-r--r--meta/packages/ubootchart/files/pass-args.patch21
-rw-r--r--meta/packages/ubootchart/ubootchart_svn.bb1
3 files changed, 1 insertions, 22 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 3a4e59e..0d2f2a3 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -141,6 +141,7 @@ SRCREV_pn-libsync ?= "208"
141SRCREV_pn-tasks ?= "299" 141SRCREV_pn-tasks ?= "299"
142SRCREV_pn-networkmanager ?= "2984" 142SRCREV_pn-networkmanager ?= "2984"
143SRCREV_pn-networkmanager-applet ?= "263" 143SRCREV_pn-networkmanager-applet ?= "263"
144SRCREV_pn-ubootchart ?= "10"
144 145
145# 146#
146# Preferred Versions: 147# Preferred Versions:
diff --git a/meta/packages/ubootchart/files/pass-args.patch b/meta/packages/ubootchart/files/pass-args.patch
deleted file mode 100644
index 9ad4282..0000000
--- a/meta/packages/ubootchart/files/pass-args.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Index: ubootchartd
2===================================================================
3--- ubootchartd (revision 9)
4+++ ubootchartd (working copy)
5@@ -7,9 +7,11 @@
6 # can read.
7 . /etc/ubootchart/ubootchart.conf
8
9-####################################################
10-# Now start capturing the stats:
11-####################################################
12-/sbin/ubootchartd_bin &
13-exec $init_prog
14+if [ $$ -eq 1 ]; then
15+ ####################################################
16+ # Now start capturing the stats:
17+ ####################################################
18+ /sbin/ubootchartd_bin &
19+fi
20
21+exec $init_prog "$@"
diff --git a/meta/packages/ubootchart/ubootchart_svn.bb b/meta/packages/ubootchart/ubootchart_svn.bb
index 50bc957..99bb913 100644
--- a/meta/packages/ubootchart/ubootchart_svn.bb
+++ b/meta/packages/ubootchart/ubootchart_svn.bb
@@ -8,7 +8,6 @@ PR = "r3"
8 8
9SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \ 9SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \
10 file://sysvinit.patch;patch=1;pnum=0 \ 10 file://sysvinit.patch;patch=1;pnum=0 \
11 file://pass-args.patch;patch=1;pnum=0 \
12 file://ubootchart-stop \ 11 file://ubootchart-stop \
13 file://ubootchart.desktop" 12 file://ubootchart.desktop"
14 13