bootchart2: update to 0.14.7

Drop bootchartd-no-bashism.patch as it's been merged upstream

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

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 (file)
index b013995..0000000
--- a/meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ffb5bae5d588aaea6325623462a8070a04767196 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Thu, 14 Aug 2014 08:33:28 -0700
-Subject: [PATCH] bootchartd.in: no bashism
-
-No bashism in bootchartd.in, so use /bin/sh.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- bootchartd.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bootchartd.in b/bootchartd.in
-index a408bab..064f6a4 100755
---- a/bootchartd.in
-+++ b/bootchartd.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Bootchart logger script
- # Ziga Mahkovec  <ziga.mahkovec@klika.si>
--- 
-1.7.9.5
-

diff --git a/meta/recipes-devtools/bootchart2/bootchart2_git.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
similarity index 97%
rename from meta/recipes-devtools/bootchart2/bootchart2_git.bb
rename to meta/recipes-devtools/bootchart2/bootchart2_0.14.7.bb
index ea9f179e8c9cfda01b1da2a31fa9158da71472d3..4b0a98068db268559fa8ba182fc87d5c876ec6a7 100644 (file)
--- 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"
 LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
 
-# one commit beyond 1.14.6 for a systemd-related bugfix
-PV = "0.14.6+git${SRCPV}"
-
 SRC_URI = "git://github.com/mmeeks/bootchart.git \
            file://bootchartd_stop.sh \
-           file://bootchartd-no-bashism.patch \
           "
 
-SRCREV = "b65ed43b0ae832080fb728245de9ef1a4b48d8b5"
-
 S = "${WORKDIR}/git"
+SRCREV = "6f050b65ae9f266645f04f0aecab9efb88375f1c"
 
 inherit systemd
 inherit update-rc.d