bootchart2: update to 0.14.9.

This commit is contained in:
Đoàn Trần Công Danh 2021-01-24 14:53:18 +07:00
parent c303c88f2c
commit 7c031fe7f6
4 changed files with 60 additions and 30 deletions

View File

@ -1,20 +0,0 @@
--- Makefile.orig 2017-12-10 19:54:55.223497878 -0500
+++ Makefile 2017-12-10 19:37:39.909790719 -0500
@@ -19,7 +19,7 @@
EARLY_PREFIX ?=
BINDIR ?= /usr/bin
-PYTHON ?= python
+PYTHON ?= python2
DOCDIR ?= /usr/share/docs/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)
MANDIR ?= /usr/share/man/man1
# never contains /usr; typically /lib, /lib64 or e.g. /lib/x86_64-linux-gnu
@@ -99,7 +99,7 @@
install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs
install-collector: all install-chroot
- install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
+ install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/bin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX)
install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf
install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector

View File

@ -0,0 +1,35 @@
Index: pybootchartgui/draw.py
===================================================================
--- pybootchartgui/draw.py.orig
+++ pybootchartgui/draw.py
@@ -508,7 +508,7 @@ def draw_processes_recursively(ctx, proc
cmdString = proc.cmd
else:
cmdString = ''
- if (OPTIONS.show_pid or OPTIONS.show_all) and ipid is not 0:
+ if (OPTIONS.show_pid or OPTIONS.show_all) and ipid != 0:
cmdString = cmdString + " [" + str(ipid // 1000) + "]"
if OPTIONS.show_all:
if proc.args:
@@ -606,7 +606,7 @@ class CumlSample:
if self.color is None:
i = self.next() % HSV_MAX_MOD
h = 0.0
- if i is not 0:
+ if i != 0:
h = (1.0 * i) / HSV_MAX_MOD
s = 0.5
v = 1.0
Index: pybootchartgui/parsing.py
===================================================================
--- pybootchartgui/parsing.py.orig
+++ pybootchartgui/parsing.py
@@ -98,7 +98,7 @@ class Trace:
def compile(self, writer):
def find_parent_id_for(pid):
- if pid is 0:
+ if pid == 0:
return 0
ppid = self.parent_map.get(pid)
if ppid:

View File

@ -0,0 +1,10 @@
--- bootchartd.in.orig 2021-01-24 15:52:43.339735933 +0700
+++ bootchartd.in 2021-01-24 15:53:30.256889311 +0700
@@ -32,6 +32,7 @@
# some initrds don't have usleep etc.
USLEEP="$COLLECTOR_BIN --usleep"
+: "${OLDPATH:=/sbin:/bin:/usr/sbin:/usr/bin}"
# we need to find our tools
PATH="/sbin:/bin:/usr/sbin:/usr/bin:$PATH"

View File

@ -1,17 +1,22 @@
# Template file for 'bootchart2'
pkgname=bootchart2
version=0.14.8.20170531
revision=3
_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
wrksrc="bootchart-${_gitrev}"
version=0.14.9
revision=1
wrksrc="bootchart-${version}"
build_style=gnu-makefile
make_install_args="EARLY_PREFIX=/usr"
makedepends="python"
depends="pygtk git"
make_install_args="EARLY_PREFIX=/usr DOCDIR=/usr/share/doc/bootchart2"
hostmakedepends="python3"
makedepends="python3"
depends="python3-cairo"
short_desc="Startup graphing tool"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2"
license="GPL-3.0-or-later"
homepage="https://github.com/xrmx/bootchart"
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
distfiles="https://github.com/xrmx/bootchart/archive/${version}.tar.gz"
checksum=cec7871c3dba47a1165873b0acde30a82221fde1d3a942da5e7dd09b513d2017
make_dirs="/usr/lib/bootchart/tmpfs 0755 root root"
conflicts="bootchart>=0"
post_patch() {
vsed -i -e 's,\$(EARLY_PREFIX)/sbin/,/usr/bin/,' Makefile
}