diff options
Diffstat (limited to 'meta/recipes-devtools/bootchart2')
3 files changed, 84 insertions, 4 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/0001-collector-Allocate-space-on-heap-for-chunks.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-collector-Allocate-space-on-heap-for-chunks.patch new file mode 100644 index 0000000000..7a8813e968 --- /dev/null +++ b/meta/recipes-devtools/bootchart2/bootchart2/0001-collector-Allocate-space-on-heap-for-chunks.patch @@ -0,0 +1,45 @@ +From 09505532b49573663fb4ff4dad424dc2ef4c1f84 Mon Sep 17 00:00:00 2001 +From: Kyle Russell <bkylerussell@gmail.com> +Date: Wed, 13 Jul 2016 17:30:00 -0400 +Subject: [PATCH] collector: Allocate space on heap for chunks + +Nicer for embedded devices which may have smaller stack limitations. + +Upstream-Status: Submitted [https://github.com/xrmx/bootchart/pull/74] + +Signed-off-by: Kyle Russell <bkylerussell@gmail.com> +--- + collector/dump.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/collector/dump.c b/collector/dump.c +index e673b5b..2f094b4 100644 +--- a/collector/dump.c ++++ b/collector/dump.c +@@ -184,12 +184,12 @@ static void dump_buffers (DumpState *s) + log ("reading %d chunks (of %d) ...\n", max_chunk, s->map.max_chunk); + for (i = 0; i < max_chunk; i++) { + FILE *output; +- char buffer[CHUNK_SIZE]; +- Chunk *c = (Chunk *)&buffer; ++ char *buffer = malloc(CHUNK_SIZE); ++ Chunk *c = (Chunk *)buffer; + size_t addr = (size_t) s->map.chunks[i]; + + lseek (s->mem, addr, SEEK_SET); +- read (s->mem, &buffer, CHUNK_SIZE); ++ read (s->mem, buffer, CHUNK_SIZE); + /* log ("type: '%s' len %d\n", + c->dest_stream, (int)c->length); */ + +@@ -197,6 +197,7 @@ static void dump_buffers (DumpState *s) + fwrite (c->data, 1, c->length, output); + bytes_dumped += c->length; + fclose (output); ++ free(buffer); + } + log ("wrote %ld kb\n", (long)(bytes_dumped+1023)/1024); + } +-- +2.7.4 + diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb index d0555c3edb..4f01734bb0 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb @@ -92,14 +92,18 @@ 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 \ + file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ " S = "${WORKDIR}/git" SRCREV = "48e0071048564c6af75ab969e842d6dec808da09" -inherit systemd -inherit update-rc.d -inherit python3native +inherit systemd update-rc.d python3native update-alternatives + +ALTERNATIVE_${PN} = "bootchartd" +ALTERNATIVE_LINK_NAME[bootchartd] = "${base_sbindir}/bootchartd" +ALTERNATIVE_PRIORITY = "100" # The only reason to build bootchart2-native is for a native pybootchartgui. BBCLASSEXTEND = "native" @@ -134,7 +138,7 @@ do_install () { } PACKAGES =+ "pybootchartgui" -FILES_pybootchartgui += "${libdir}/python*/site-packages/pybootchartgui ${bindir}/pybootchartgui" +FILES_pybootchartgui += "${PYTHON_SITEPACKAGES_DIR}/pybootchartgui ${bindir}/pybootchartgui" RDEPENDS_pybootchartgui = "python3-pycairo python3-compression python3-image python3-textutils python3-shell python3-compression python3-codecs" RDEPENDS_${PN}_class-target += "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" RDEPENDS_${PN}_class-target += "lsb" @@ -142,6 +146,7 @@ DEPENDS_append_class-native = " python3-pycairo-native" PACKAGES =+ "bootchartd-stop-initscript" FILES_bootchartd-stop-initscript += "${sysconfdir}/init.d ${sysconfdir}/rc*.d" +RDEPENDS_bootchartd-stop-initscript = "${PN}" FILES_${PN} += "${base_libdir}/bootchart/bootchart-collector" FILES_${PN} += "${base_libdir}/bootchart/tmpfs" |