From e1a710624225537547936b07d7a2d45e2fd5ed17 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 13 Jul 2012 09:11:53 +0000 Subject: bootchart: update to v1.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- ...g-add-rudimentary-support-for-ARM-cpuinfo.patch | 49 ++++++++++++++++++++++ ...c-os-release-and-use-PRETTY_NAME-for-the-.patch | 39 +++++++++++++++++ .../recipes-devtools/bootchart/bootchart_git.bb | 16 ++++--- 3 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 meta-oe/recipes-devtools/bootchart/bootchart/0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch create mode 100644 meta-oe/recipes-devtools/bootchart/bootchart/0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch diff --git a/meta-oe/recipes-devtools/bootchart/bootchart/0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch b/meta-oe/recipes-devtools/bootchart/bootchart/0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch new file mode 100644 index 0000000000..0494c4f783 --- /dev/null +++ b/meta-oe/recipes-devtools/bootchart/bootchart/0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch @@ -0,0 +1,49 @@ +From 8d40b4c286e005e82fa50b66fbbbde22b7e65e15 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sun, 20 May 2012 21:35:34 +0200 +Subject: [PATCH 1/2] svg: add rudimentary support for ARM cpuinfo + +On ARM /proc/cpuinfo looks like this: + +root@beagleboneA3-0428:~# cat /proc/cpuinfo +Processor : ARMv7 Processor rev 2 (v7l) +BogoMIPS : 498.89 +Features : swp half thumb fastmult vfp edsp thumbee neon vfpv3 tls +CPU implementer : 0x41 +CPU architecture: 7 +CPU variant : 0x3 +CPU part : 0xc08 +CPU revision : 2 + +Hardware : am335xevm +Revision : 0000 +Serial : 0000000000000000 + +So no real way to get the actual SoC name, TI AM3359, but a lot better than 'Unknown' + +Signed-off-by: Koen Kooi +--- + +Upstream-status: submitted + + svg.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/svg.c b/svg.c +index 80e0292..53724b2 100644 +--- a/svg.c ++++ b/svg.c +@@ -178,6 +178,10 @@ void svg_title(void) + strncpy(cpu, &buf[13], 255); + break; + } ++ if (strstr(buf, "Processor")) { ++ strncpy(cpu, &buf[12], 255); ++ break; ++ } + } + fclose(f); + } +-- +1.7.10 + diff --git a/meta-oe/recipes-devtools/bootchart/bootchart/0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch b/meta-oe/recipes-devtools/bootchart/bootchart/0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch new file mode 100644 index 0000000000..b3bda4582c --- /dev/null +++ b/meta-oe/recipes-devtools/bootchart/bootchart/0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch @@ -0,0 +1,39 @@ +From e3adb4c312c6ba3491b7c173559efac7a53e5abc Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sun, 20 May 2012 22:12:29 +0200 +Subject: [PATCH 2/2] svg: open /etc/os-release and use PRETTY_NAME for the + 'Build' name + +Signed-off-by: Koen Kooi +--- + +Upstream-status: Submitted + + svg.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/svg.c b/svg.c +index 53724b2..c675d84 100644 +--- a/svg.c ++++ b/svg.c +@@ -194,6 +194,17 @@ void svg_title(void) + fclose(f); + } + ++ f = fopen("/etc/os-release", "r"); ++ if(f) { ++ while (fgets(buf, 255, f)) { ++ if (strstr(buf, "PRETTY_NAME=")) { ++ strncpy(build, &buf[12], 255); ++ break; ++ } ++ } ++ fclose(f); ++ } ++ + svg("Bootchart for %s - %s\n", + uts.nodename, date); + svg("System: %s %s %s %s\n", +-- +1.7.10 + diff --git a/meta-oe/recipes-devtools/bootchart/bootchart_git.bb b/meta-oe/recipes-devtools/bootchart/bootchart_git.bb index 62705f6e52..f5ef582688 100644 --- a/meta-oe/recipes-devtools/bootchart/bootchart_git.bb +++ b/meta-oe/recipes-devtools/bootchart/bootchart_git.bb @@ -4,12 +4,18 @@ HOMEPAGE = "http://meego.gitorious.org/meego-developer-tools/bootchart" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" -SRC_URI = "git://gitorious.org/meego-developer-tools/bootchart.git" -SRCREV = "4420bc4318c4aada7c7d128105e56ecc8c84cb19" +PV = "1.16" +PR = "r1" +PE = "1" + +SRC_URI = "git://gitorious.org/meego-developer-tools/bootchart.git \ + file://0001-svg-add-rudimentary-support-for-ARM-cpuinfo.patch \ + file://0002-svg-open-etc-os-release-and-use-PRETTY_NAME-for-the-.patch \ + " + +SRCREV = "872fb107028e377eef3c0c7c8a6e0f7c32b8ebb8" S = "${WORKDIR}/git" -do_install() { - oe_runmake install DESTDIR=${D} -} +inherit autotools -- cgit 1.2.3-korg