summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMing Liu <peter.x.liu@external.atlascopco.com>2016-08-17 13:26:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-23 17:44:16 +0100
commit299e67291f3d396ba93f4c4a94120228bb9b1d88 (patch)
tree756398e996e29cae6fc27b491135fa56addfbf56
parentc3fa2eca5d2667c668641373948acfb7172ff2e8 (diff)
downloadopenembedded-core-299e67291f3d396ba93f4c4a94120228bb9b1d88.tar.gz
openembedded-core-299e67291f3d396ba93f4c4a94120228bb9b1d88.tar.bz2
openembedded-core-299e67291f3d396ba93f4c4a94120228bb9b1d88.zip
bootchart2: fixes a BOOTLOG_DEST typo
A flaw was observed in bootchartd that BUILDLOG_DEST should actually be BOOTLOG_DEST, this seems to be a typo or mix-up which has been fixed in upstream. Cherry pick the fix since bootchart2 0.14.8 is still the newest release so far. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch30
-rw-r--r--meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch
new file mode 100644
index 0000000000..118814a807
--- /dev/null
+++ b/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch
@@ -0,0 +1,30 @@
+From 2225ab2038bfe50f16f972e39d89bcd0bd7767f5 Mon Sep 17 00:00:00 2001
+From: Steffen Pankratz <kratz00@gmx.de>
+Date: Tue, 9 Feb 2016 13:49:42 +0100
+Subject: [PATCH] Fixed: Missing default value for BOOTLOG_DEST
+
+Upstream-Status: Backport
+
+BUILDLOG_DEST seems to be a typo or mix-up which was introduced with 281d1df80884bf2969c509ec60ee8a6593524fe8
+
+Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
+---
+ bootchartd.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bootchartd.in b/bootchartd.in
+index f58ab9e..30af677 100755
+--- a/bootchartd.in
++++ b/bootchartd.in
+@@ -37,7 +37,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:$PATH"
+
+ # Defaults, in case we can't find our configuration
+ SAMPLE_HZ=50
+-BUILDLOG_DEST=/var/log/bootchart.tgz
++BOOTLOG_DEST=/var/log/bootchart.tgz
+ AUTO_RENDER="no"
+ AUTO_RENDER_DIR="/var/log"
+ AUTO_RENDER_FORMAT="png"
+--
+1.9.1
+
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
index bc8c1a8a88..fdebb6419c 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
@@ -92,6 +92,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
SRC_URI = "git://github.com/mmeeks/bootchart.git \
file://bootchartd_stop.sh \
+ file://0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch \
"
S = "${WORKDIR}/git"