diff options
| author | Ross Burton <ross@openedhand.com> | 2007-11-06 08:54:47 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-11-06 08:54:47 +0000 |
| commit | 3b6c384c0513d5a3f3665d81ea538c8f9d13ead1 (patch) | |
| tree | 0dccffa1d43e0b6fd2e9f1ff11f13b9f5a4290e7 | |
| parent | 1ab9a482036a7a9314d47377c11f4478b9b77903 (diff) | |
| download | openembedded-core-3b6c384c0513d5a3f3665d81ea538c8f9d13ead1.tar.gz openembedded-core-3b6c384c0513d5a3f3665d81ea538c8f9d13ead1.tar.bz2 openembedded-core-3b6c384c0513d5a3f3665d81ea538c8f9d13ead1.zip | |
Pin ubootchart srcrev, and remove integrated patch
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3076 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/conf/distro/poky.conf | 1 | ||||
| -rw-r--r-- | meta/packages/ubootchart/files/pass-args.patch | 21 | ||||
| -rw-r--r-- | meta/packages/ubootchart/ubootchart_svn.bb | 1 |
3 files changed, 1 insertions, 22 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 3a4e59e23a..0d2f2a3fd1 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 9ad4282f21..0000000000 --- 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 50bc9575d6..99bb913a7f 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" |