diff options
| -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" | |||
| 141 | SRCREV_pn-tasks ?= "299" | 141 | SRCREV_pn-tasks ?= "299" |
| 142 | SRCREV_pn-networkmanager ?= "2984" | 142 | SRCREV_pn-networkmanager ?= "2984" |
| 143 | SRCREV_pn-networkmanager-applet ?= "263" | 143 | SRCREV_pn-networkmanager-applet ?= "263" |
| 144 | SRCREV_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 9ad4282f21..0000000000 --- a/meta/packages/ubootchart/files/pass-args.patch +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | Index: 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 50bc9575d6..99bb913a7f 100644 --- a/meta/packages/ubootchart/ubootchart_svn.bb +++ b/meta/packages/ubootchart/ubootchart_svn.bb | |||
| @@ -8,7 +8,6 @@ PR = "r3" | |||
| 8 | 8 | ||
| 9 | SRC_URI = "svn://ubootchart.googlecode.com/svn/;proto=http;module=trunk \ | 9 | SRC_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 | ||
