Date: Tuesday, June 19, 2012 @ 08:43:13 Author: tomegun Revision: 162072
upgpkg: bootchart 1.18-1 upstream release Added: bootchart/trunk/README.patch (from rev 162066, bootchart/trunk/build.patch) Modified: bootchart/trunk/PKGBUILD Deleted: bootchart/trunk/build.patch --------------+ PKGBUILD | 14 ++++++-------- README.patch | 25 +++++++++++++++++++++++++ build.patch | 50 -------------------------------------------------- 3 files changed, 31 insertions(+), 58 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-06-19 12:28:59 UTC (rev 162071) +++ PKGBUILD 2012-06-19 12:43:13 UTC (rev 162072) @@ -1,27 +1,25 @@ # $Id$ # Maintainer: Tom Gundersen <t...@jklm.no> pkgname="bootchart" -pkgver=1.16 +pkgver=1.18 pkgrel=1 pkgdesc="A 'startup' graphing tool" url="https://meego.gitorious.org/meego-developer-tools/bootchart" license=('GPL2') arch=(i686 x86_64) depends=('glibc') -source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'build.patch') +source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../build.patch - - make + ./configure --prefix=/usr --sbindir=/usr/bin + + make } package() { cd "$srcdir/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('d563854bdbf0f0de821406881164a607' - '381f1375d5563ced806a5bbe7b2efd8e') +md5sums=('55a29d62efe0579710b7e502b41a109b') Copied: bootchart/trunk/README.patch (from rev 162066, bootchart/trunk/build.patch) =================================================================== --- README.patch (rev 0) +++ README.patch 2012-06-19 12:43:13 UTC (rev 162072) @@ -0,0 +1,25 @@ +From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <t...@jklm.no> +Date: Fri, 16 Mar 2012 01:34:10 +0100 +Subject: [PATCH] README: point to the correct location of the binary + +--- + README | 2 +- + 1 file changed, 1 insertions(+), 1 deletions(-) + +diff --git a/README b/README +index fa1d730..1906abb 100644 +--- a/README ++++ b/README +@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool + Bootchart is a tool, usually run at system startup, that collects and graphs + the CPU and disk load of the system as it works. The output of bootchart is + an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel +-by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork ++by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork + init off to resume normal system startup, while monitoring and logging + startup information in the background. + +-- +1.7.9.5 + Deleted: build.patch =================================================================== --- build.patch 2012-06-19 12:28:59 UTC (rev 162071) +++ build.patch 2012-06-19 12:43:13 UTC (rev 162072) @@ -1,50 +0,0 @@ -From 4d34b379411f781a494b4775260d550ff61e22e4 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <t...@jklm.no> -Date: Fri, 16 Mar 2012 01:34:10 +0100 -Subject: [PATCH] Makefile: move binary and avoid empty dirs - -Install to /usr/bin by default, and don't install an empty /etc. - -v2: Adjust README to reflect the change. ---- - Makefile | 10 ++++------ - README | 2 +- - 2 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/Makefile b/Makefile -index 2150ed3..ae432fa 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,12 +6,10 @@ CC := gcc - all: bootchartd - - install: bootchartd -- mkdir -p $(DESTDIR)/sbin -- mkdir -p $(DESTDIR)/etc -- mkdir -p $(DESTDIR)/usr/share/doc/bootchart/ -- install -m0755 bootchartd $(DESTDIR)/sbin/ -- install -m0644 bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/ -- install -m0644 README COPYING $(DESTDIR)/usr/share/doc/bootchart/ -+ install -d $(DESTDIR)/usr/bin -+ install -d $(DESTDIR)/usr/share/doc/bootchart -+ install -m0755 bootchartd $(DESTDIR)/usr/bin/ -+ install -m0644 README COPYING bootchartd.conf.example $(DESTDIR)/usr/share/doc/bootchart/ - - OBJS := log.o svg.o bootchart.o - -diff --git a/README b/README -index fa1d730..1906abb 100644 ---- a/README -+++ b/README -@@ -6,7 +6,7 @@ Bootchart - a 'startup' graphing tool - Bootchart is a tool, usually run at system startup, that collects and graphs - the CPU and disk load of the system as it works. The output of bootchart is - an SVG graph. Normally, bootchart is invoked as `bootchartd` by the kernel --by passing "init=/sbin/bootchartd" to the kernel. Bootchart will then fork -+by passing "init=/usr/bin/bootchartd" to the kernel. Bootchart will then fork - init off to resume normal system startup, while monitoring and logging - startup information in the background. - --- -1.7.9.5 -