diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-10 17:23:24 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 09:28:48 -0700 |
commit | a8804b18994942bbfd21f7874bc47824788ad07e (patch) | |
tree | 7cbcb817ce4052a7af7de7b7c9be66385ba3b433 /meta/recipes-devtools | |
parent | 627d183a8954b51a1ea2b34d5f3e25f2ef80967e (diff) | |
download | poky-a8804b18994942bbfd21f7874bc47824788ad07e.tar.gz |
bootchart2: update to 0.14.7
Drop bootchartd-no-bashism.patch as it's been merged upstream
(From OE-Core rev: 274a1cb1bbeea01647a44e50e3323038da3e9647)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch | 27 | ||||
-rw-r--r-- | meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb (renamed from meta/recipes-devtools/bootchart2/bootchart2_git.bb) | 7 |
2 files changed, 1 insertions, 33 deletions
diff --git a/meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch b/meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch deleted file mode 100644 index b013995a0d..0000000000 --- a/meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From ffb5bae5d588aaea6325623462a8070a04767196 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 14 Aug 2014 08:33:28 -0700 | ||
4 | Subject: [PATCH] bootchartd.in: no bashism | ||
5 | |||
6 | No bashism in bootchartd.in, so use /bin/sh. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | --- | ||
12 | bootchartd.in | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/bootchartd.in b/bootchartd.in | ||
16 | index a408bab..064f6a4 100755 | ||
17 | --- a/bootchartd.in | ||
18 | +++ b/bootchartd.in | ||
19 | @@ -1,4 +1,4 @@ | ||
20 | -#!/bin/bash | ||
21 | +#!/bin/sh | ||
22 | # | ||
23 | # Bootchart logger script | ||
24 | # Ziga Mahkovec <ziga.mahkovec@klika.si> | ||
25 | -- | ||
26 | 1.7.9.5 | ||
27 | |||
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_git.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb index ea9f179e8c..4b0a98068d 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_git.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb | |||
@@ -88,17 +88,12 @@ HOMEPAGE = "https://github.com/mmeeks/bootchart" | |||
88 | LICENSE = "GPL-3.0" | 88 | LICENSE = "GPL-3.0" |
89 | LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124" | 89 | LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124" |
90 | 90 | ||
91 | # one commit beyond 1.14.6 for a systemd-related bugfix | ||
92 | PV = "0.14.6+git${SRCPV}" | ||
93 | |||
94 | SRC_URI = "git://github.com/mmeeks/bootchart.git \ | 91 | SRC_URI = "git://github.com/mmeeks/bootchart.git \ |
95 | file://bootchartd_stop.sh \ | 92 | file://bootchartd_stop.sh \ |
96 | file://bootchartd-no-bashism.patch \ | ||
97 | " | 93 | " |
98 | 94 | ||
99 | SRCREV = "b65ed43b0ae832080fb728245de9ef1a4b48d8b5" | ||
100 | |||
101 | S = "${WORKDIR}/git" | 95 | S = "${WORKDIR}/git" |
96 | SRCREV = "6f050b65ae9f266645f04f0aecab9efb88375f1c" | ||
102 | 97 | ||
103 | inherit systemd | 98 | inherit systemd |
104 | inherit update-rc.d | 99 | inherit update-rc.d |