summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-06 15:57:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-08 10:51:59 +0100
commit56464dd3963121b79fadd2bdb48c835e4fd4309d (patch)
treebf6061800cf50eda71c4b923395931aaf3f0d9ac
parentac8f224a9dce11761020517776e895a09c5afbe8 (diff)
downloadpoky-56464dd3963121b79fadd2bdb48c835e4fd4309d.tar.gz
bootchart2: Update to master-tip
This has several fixes to get it building with glibc 2.28+ remove backported patch which is not needed now (From OE-Core rev: f1dc6b5eebf455c46036e200c1eaff34ebd50db1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.bb4
2 files changed, 2 insertions, 32 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
deleted file mode 100644
index 118814a807..0000000000
--- a/meta/recipes-devtools/bootchart2/bootchart2/0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 2225ab2038bfe50f16f972e39d89bcd0bd7767f5 Mon Sep 17 00:00:00 2001
2From: Steffen Pankratz <kratz00@gmx.de>
3Date: Tue, 9 Feb 2016 13:49:42 +0100
4Subject: [PATCH] Fixed: Missing default value for BOOTLOG_DEST
5
6Upstream-Status: Backport
7
8BUILDLOG_DEST seems to be a typo or mix-up which was introduced with 281d1df80884bf2969c509ec60ee8a6593524fe8
9
10Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com>
11---
12 bootchartd.in | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/bootchartd.in b/bootchartd.in
16index f58ab9e..30af677 100755
17--- a/bootchartd.in
18+++ b/bootchartd.in
19@@ -37,7 +37,7 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:$PATH"
20
21 # Defaults, in case we can't find our configuration
22 SAMPLE_HZ=50
23-BUILDLOG_DEST=/var/log/bootchart.tgz
24+BOOTLOG_DEST=/var/log/bootchart.tgz
25 AUTO_RENDER="no"
26 AUTO_RENDER_DIR="/var/log"
27 AUTO_RENDER_FORMAT="png"
28--
291.9.1
30
diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
index b3c889b0a8..396d0ec0a1 100644
--- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
+++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb
@@ -92,12 +92,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)"
92 92
93SRC_URI = "git://github.com/xrmx/bootchart.git \ 93SRC_URI = "git://github.com/xrmx/bootchart.git \
94 file://bootchartd_stop.sh \ 94 file://bootchartd_stop.sh \
95 file://0001-Fixed-Missing-default-value-for-BOOTLOG_DEST.patch \
96 file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ 95 file://0001-collector-Allocate-space-on-heap-for-chunks.patch \
97 " 96 "
98 97
99S = "${WORKDIR}/git" 98S = "${WORKDIR}/git"
100SRCREV = "48e0071048564c6af75ab969e842d6dec808da09" 99SRCREV = "331ada031f1d65f6d934d918f896e1c708c64bf7"
100PV .= "+git${SRCPV}"
101 101
102inherit systemd update-rc.d python3native update-alternatives 102inherit systemd update-rc.d python3native update-alternatives
103 103