Upstream recipe for bootchart2 from WebOS (revised)
cover Upstream recipe for bootchart2 from WebOS (revised)
Hello list,
This series adds a recipe for the bootchart2 daemon (a fork of the original bootchart.) It's based on a recipe from Meta-WebOS, but with extensive modifications.
It is intended that bootchart2 will supersede the other bootchart daemons kicking around in oe-core/meta-oe. See bug 5893. [1]
Regards,
-Max Eliaser
[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=5893
The following changes since commit 5452824960e8e77005a25ac11fd069d927523d3e:
default-distrovars.inc: Remove unused variable 'LIMIT_BUILT_LOCALES' (2014-06-13 13:08:44 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib meliaser/bootchart2-attempt2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=meliaser/bootchart2-attempt2
Max Eliaser (3):
python: python-pycairo: add python-pycairo-native
bootchart2: create recipe for bootchart2
ubootchart: delete ubootchart recipe
meta-yocto/conf/distro/include/distro_alias.inc | 1 - meta-yocto/conf/distro/include/maintainers.inc | 1 - meta-yocto/conf/distro/include/recipe_color.inc | 1 - .../conf/distro/include/upstream_tracking.inc | 2 - .../bootchart2/bootchart2/bootchartd_stop.sh | 18 +++ meta/recipes-devtools/bootchart2/bootchart2_git.bb | 148 +++++++++++++++++++++ .../python/python-pycairo_1.10.0.bb | 2 + .../ubootchart/files/sysvinit.patch | 14 -- .../ubootchart/files/ubootchart-stop | 3 - .../ubootchart/files/ubootchart.desktop | 6 - meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 39 ------ 11 files changed, 168 insertions(+), 67 deletions(-) create mode 100644 meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh create mode 100644 meta/recipes-devtools/bootchart2/bootchart2_git.bb delete mode 100644 meta/recipes-devtools/ubootchart/files/sysvinit.patch delete mode 100644 meta/recipes-devtools/ubootchart/files/ubootchart-stop delete mode 100644 meta/recipes-devtools/ubootchart/files/ubootchart.desktop delete mode 100644 meta/recipes-devtools/ubootchart/ubootchart_svn.bb
Signature · 1 line
1.8.3.2
PATCH 1/3 python: python-pycairo: add python-pycairo-native
A -native variant of python-pycairo will be necessary for running the native version of pybootchartgui. It may also come in handy for running other Python utilities from the native sysroot.
--- meta/recipes-devtools/python/python-pycairo_1.10.0.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/python/python-pycairo_1.10.0.bb +2 -0
@@ -20,6 +20,8 @@ S = "${WORKDIR}/py2cairo-${PV}" inherit distutils pkgconfig +BBCLASSEXTEND = "native" + do_configure() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} ./waf configure --prefix=${D}${prefix} --libdir=${D}${libdir} }
Signature · 1 line
1.8.3.2
PATCH 2/3 bootchart2: create recipe for bootchart2
In reply to Max EliaserThis recipe creates packages for the bootchart2 system-wide profiler daemon and related utilities. It fetches the Git revision immediately past the one corresponding to the 0.14.6 release of bootchart2. (0.14.6 had a systemd- related bug that was corrected right after it was tagged.)
The recipe contains three packages:
* bootchart2 - The daemon itself.
* pybootchartgui - Python program to visualize and display the data
collected by bootchart2 or compatible daemons such as the original bootchart.
* bootchartd-stop-initscript - A SysV init script to stop data collection
when booting completes.
Depending on how you wish to use bootchart2, you may not end up having all three of those packages installed on your image.
There is also a bootchart2-native variant, which is intended solely to provide a native version of the pybootchartgui utility. The non-cross-compiled version of the bootchart2 daemon has not been tested at all, don't use it.
The recipe is extensively documented. Read the comments at the beginning of bootchart2_git.bb or else you'll have no idea how to use it.
This recipe is based on a recipe from meta-WebOS. The WebOS people had some extra code (including patches against the bootchart2 code) to support the Upstart init system. However, since upstream Poky does not support Upstart, that stuff is being left behind. The WebOS people can write a bbappend to re- add it.
Original recipe written by Wonhong Kwon of LG. Upstreamed as part of the solution to [YOCTO #5893].
--- .../bootchart2/bootchart2/bootchartd_stop.sh | 18 +++ meta/recipes-devtools/bootchart2/bootchart2_git.bb | 148 +++++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh create mode 100644 meta/recipes-devtools/bootchart2/bootchart2_git.bb
meta/recipes-devtools/bootchart2/bootchart2/bootchartd_stop.sh new file +18 -0
@@ -0,0 +1,18 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: bootchartd_stop +# Required-Start: $remote_fs $all +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: +# Short-Description: Stop bootchartd collection +# Description: This script accompanies bootchartd from bootchart2. +# bootchartd should stop detect the end of the boot process +# automatically if a window manager is launched, but for +# command-line only operating systems, this script should be +# used instead. +### END INIT INFO + +/sbin/bootchartd stop + +: exit 0
meta/recipes-devtools/bootchart2/bootchart2_git.bb new file +148 -0
148 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH 3/3 ubootchart: delete ubootchart recipe
In reply to Max EliaserThe Ubootchart recipe had known issues. Ubootchart itself is no longer updated upstream. Ubootchart is also now redundant with Bootchart2.
If people still want ubootchart around, it can be moved to meta-oe.
Ubootchart removed as part of the solution to [YOCTO #5893].
--- meta-yocto/conf/distro/include/distro_alias.inc | 1 - meta-yocto/conf/distro/include/maintainers.inc | 1 - meta-yocto/conf/distro/include/recipe_color.inc | 1 - .../conf/distro/include/upstream_tracking.inc | 2 -- .../ubootchart/files/sysvinit.patch | 14 -------- .../ubootchart/files/ubootchart-stop | 3 -- .../ubootchart/files/ubootchart.desktop | 6 ---- meta/recipes-devtools/ubootchart/ubootchart_svn.bb | 39 ---------------------- 8 files changed, 67 deletions(-) delete mode 100644 meta/recipes-devtools/ubootchart/files/sysvinit.patch delete mode 100644 meta/recipes-devtools/ubootchart/files/ubootchart-stop delete mode 100644 meta/recipes-devtools/ubootchart/files/ubootchart.desktop delete mode 100644 meta/recipes-devtools/ubootchart/ubootchart_svn.bb
meta-yocto/conf/distro/include/distro_alias.inc +0 -1
@@ -435,7 +435,6 @@ DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/" DISTRO_PN_ALIAS_pn-tslib = "Debian=tslib Ubuntu=tslib" DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera" DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" -DISTRO_PN_ALIAS_pn-ubootchart = "OSPDT upstream=http://code.google.com/p/ubootchart" DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools" DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage Debian=uboot-mkimage" DISTRO_PN_ALIAS_pn-udev-extraconf = "OE-Core"
meta-yocto/conf/distro/include/maintainers.inc +0 -1
@@ -646,7 +646,6 @@ RECIPE_MAINTAINER_pn-tslib = "Paul Eggleton <[email protected]>" RECIPE_MAINTAINER_pn-ttf-bitstream-vera = "Valentin Popa <[email protected]>" RECIPE_MAINTAINER_pn-tzcode-native = "Robert Yang <[email protected]>" RECIPE_MAINTAINER_pn-tzdata = "Robert Yang <[email protected]>" -RECIPE_MAINTAINER_pn-ubootchart = "Cristiana Voicu <[email protected]>" RECIPE_MAINTAINER_pn-u-boot-fw-utils = "Cristiana Voicu <[email protected]>" RECIPE_MAINTAINER_pn-u-boot-mkimage = "Cristiana Voicu <[email protected]>" RECIPE_MAINTAINER_pn-udev-extraconf = "Cristiana Voicu <[email protected]>"
meta-yocto/conf/distro/include/recipe_color.inc +0 -1
@@ -383,7 +383,6 @@ RECIPE_COLOR_pn-trapproto = "yellow" RECIPE_COLOR_pn-tslib = "yellow" RECIPE_COLOR_pn-ttf-bitstream-vera = "yellow" RECIPE_COLOR_pn-tzdata = "yellow" -RECIPE_COLOR_pn-ubootchart = "red" RECIPE_COLOR_pn-u-boot-mkimage = "red" RECIPE_COLOR_pn-udev = "yellow" RECIPE_COLOR_pn-udev-extraconf = "yellow"
meta-yocto/conf/distro/include/upstream_tracking.inc +0 -2
@@ -207,8 +207,6 @@ RECIPE_UPSTREAM_VERSION_pn-tremor="20120122" RECIPE_UPSTREAM_DATE_pn-tremor="Jan 22, 2012" CHECK_DATE_pn-tremor = "Mar 11, 2013" RECIPE_NO_UPDATE_REASON_pn-tremor = "Same revision on different SVN modules" -RECIPE_UPSTREAM_VERSION_pn-ubootchart = "0.0+r12" -CHECK_DATE_pn-ubootchart = "Sep 11, 2012" RECIPE_UPSTREAM_DATE_pn-udev-extraconf = "n/a" RECIPE_UPSTREAM_VERSION_pn-unifdef-native="2.6.18+git" RECIPE_UPSTREAM_DATE_pn-unifdef-native = "Feb 05, 2011"
meta/recipes-devtools/ubootchart/files/sysvinit.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [distribution] - -Index: ubootchart.conf -=================================================================== ---- ubootchart.conf (revision 9) -+++ ubootchart.conf (working copy) -@@ -1,6 +1,6 @@ - - # If you want to chain on and run somthing other than /sbin/init... --export init_prog=/sbin/init -+export init_prog=/sbin/init.sysvinit - - # On startup ubootchart will mount a tmpfs filesystem at this - # location and chdir here. This is only used for the logging of
meta/recipes-devtools/ubootchart/files/ubootchart-stop deleted +0 -3
@@ -1,3 +0,0 @@ -#! /bin/sh - -kill -USR1 $(pidof ubootchartd_bin)
meta/recipes-devtools/ubootchart/files/ubootchart.desktop deleted +0 -6
@@ -1,6 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=/sbin/ubootchart-stop -Name=Stop Bootchart -Type=Application -Categories=Programming;
meta/recipes-devtools/ubootchart/ubootchart_svn.bb deleted +0 -39
@@ -1,39 +0,0 @@ -SUMMARY = "A boot profiling tool" -HOMEPAGE = "http://code.google.com/p/ubootchart/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" -SRCREV = "12" -PV = "0.0+r${SRCPV}" -PR = "r6" - -#RRECOMMENDS_${PN} = "acct" - -SRC_URI = "svn://ubootchart.googlecode.com/svn/;protocol=http;module=trunk \ - file://sysvinit.patch;striplevel=0 \ - file://ubootchart-stop \ - file://ubootchart.desktop" - -S = "${WORKDIR}/trunk" - -inherit update-alternatives - -ALTERNATIVE_${PN} = "init" -ALTERNATIVE_TARGET[init] = "${base_sbindir}/ubootchartd" -ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init" -ALTERNATIVE_PRIORITY = "70" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} ${LIBS} ${INCLUDES} ${S}/ubootchartd_bin.c -o ubootchartd_bin -} - -do_install() { - install -m 0755 -d ${D}${base_sbindir} ${D}${sysconfdir}/ubootchart ${D}${datadir}/applications - install -m 0755 ${S}/ubootchartd_bin ${D}${base_sbindir} - install -m 0755 ${S}/ubootchartd ${D}${base_sbindir} - install -m 0644 ${S}/ubootchart.conf ${D}${sysconfdir}/ubootchart - install -m 0755 ${S}/start.sh ${D}${sysconfdir}/ubootchart - install -m 0755 ${S}/finish.sh ${D}${sysconfdir}/ubootchart - - install -m 0755 ${WORKDIR}/ubootchart-stop ${D}${base_sbindir} - install -m 0644 ${WORKDIR}/ubootchart.desktop ${D}${datadir}/applications -}
Signature · 1 line
1.8.3.2