summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 3a4e59e23..0d2f2a3fd 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -141,6 +141,7 @@ SRCREV_pn-libsync ?= "208"
SRCREV_pn-tasks ?= "299"
SRCREV_pn-networkmanager ?= "2984"
SRCREV_pn-networkmanager-applet ?= "263"
+SRCREV_pn-ubootchart ?= "10"
#
# 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 9ad4282f2..000000000
--- a/meta/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/packages/ubootchart/ubootchart_svn.bb b/meta/packages/ubootchart/ubootchart_svn.bb
index 50bc9575d..99bb913a7 100644
--- a/meta/packages/ubootchart/ubootchart_svn.bb
+++ b/meta/packages/ubootchart/ubootchart_svn.bb
@@ -8,7 +8,6 @@ PR = "r3"
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"