summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.1.inc2
-rw-r--r--packages/bootchart/bootchart_0.9.bb17
-rw-r--r--packages/images/bootstrap-image-bootchart.bb10
3 files changed, 19 insertions, 10 deletions
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
index 3e4b581353..27a6164e54 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc
@@ -154,7 +154,7 @@ PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1"
PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1"
PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1"
PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0"
-PREFERRED_VERSION_libxfont ?= "X11R7.1-1.1.0"
+PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0"
PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2"
PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1"
PREFERRED_VERSION_libxkbfile ?= "X11R7.1-1.0.3"
diff --git a/packages/bootchart/bootchart_0.9.bb b/packages/bootchart/bootchart_0.9.bb
index b9b4029590..abbdda4488 100644
--- a/packages/bootchart/bootchart_0.9.bb
+++ b/packages/bootchart/bootchart_0.9.bb
@@ -2,28 +2,27 @@ DESCRIPTION = "Bootchart is a tool for performance analysis and visualization of
LICENSE = "GPLv2"
HOMEPAGE = "http://www.bootchart.org/"
MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
-
+PR = "r1"
#this only installs the loggers, you will need to run the renderers on your workstation
#boot with 'init=/sbin/bootchartd' and do '/sbin/bootchartd stop' to end the logging
#needed for a real /bin/sh and /bin/sleep
-DEPENDS = "bash coreutils"
-RDEPENDS = "bash coreutils"
+DEPENDS = "bash coreutils acct"
+RDEPENDS = "bash coreutils acct"
#this is a plain shell script
PACKAGE_ARCH = "all"
-SRC_URI = "file://bootchart \
- file://bootchartd \
- file://bootchartd.conf"
+SRC_URI = "${SOURCEFORGE_MIRROR}/bootchart/bootchart-${PV}.tar.bz2\
+ file://handheld.patch;patch=1"
do_install() {
install -d ${D}/sbin
install -d ${D}/etc
- install -m 755 ${WORKDIR}/bootchart ${D}/sbin
- install -m 755 ${WORKDIR}/bootchartd ${D}/sbin
- install -m 644 ${WORKDIR}/bootchart ${D}/etc
+ install -d ${D}/bootchart
+ install -m 755 ${S}/script/bootchartd ${D}/sbin
+ install -m 644 ${S}/script/bootchartd.conf ${D}/etc
}
diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb
new file mode 100644
index 0000000000..68cfac7490
--- /dev/null
+++ b/packages/images/bootstrap-image-bootchart.bb
@@ -0,0 +1,10 @@
+export IMAGE_BASENAME = "bootstrap-image-bootchart"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "task-bootstrap bootchart acct"
+
+DEPENDS = "task-bootstrap bootchart"
+RDEPENDS = "acct"
+
+inherit image_ipk
+
+LICENSE = MIT