Pin ubootchart srcrev, and remove integrated patch

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3076 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 3a4e59e23a8355f5e318dc99f23f5c069b2ffa41..0d2f2a3fd18b1e38dceb09785de46f37427d81f1 100644 (file)
--- 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 (file)
index 9ad4282..0000000
--- 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 50bc9575d65829bbdeb922f44956e72edca0e021..99bb913a7f2d8a923c5010007156d501f6e4142b 100644 (file)
--- 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"