Reapply "main/bootchart2: upgrade to 0.14.9_git20220807"
This reverts commit e48304b386.
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7120>
This commit is contained in:
parent
fca3e7d7ee
commit
904e59fbc2
3 changed files with 8 additions and 82 deletions
|
|
@ -1,41 +0,0 @@
|
|||
diff --git a/pybootchartgui.py b/pybootchartgui.py
|
||||
index 947ce10..55f56ca 100755
|
||||
--- a/pybootchartgui.py
|
||||
+++ b/pybootchartgui.py
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/python
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# This file is part of pybootchartgui.
|
||||
|
||||
diff --git a/pybootchartgui/parsing.py b/pybootchartgui/parsing.py
|
||||
index 993d7bf..433eb8b 100644
|
||||
--- a/pybootchartgui/parsing.py
|
||||
+++ b/pybootchartgui/parsing.py
|
||||
@@ -23,7 +23,7 @@ import string
|
||||
import re
|
||||
import sys
|
||||
import tarfile
|
||||
-from time import clock
|
||||
+from time import perf_counter
|
||||
from collections import defaultdict
|
||||
from functools import reduce
|
||||
|
||||
@@ -658,7 +658,7 @@ def get_num_cpus(headers):
|
||||
|
||||
def _do_parse(writer, state, name, file):
|
||||
writer.status("parsing '%s'" % name)
|
||||
- t1 = clock()
|
||||
+ t1 = perf_counter()
|
||||
if name == "header":
|
||||
state.headers = _parse_headers(file)
|
||||
elif name == "proc_diskstats.log":
|
||||
@@ -680,7 +680,7 @@ def _do_parse(writer, state, name, file):
|
||||
state.ps_stats = _parse_proc_ps_log(writer, file)
|
||||
elif name == "kernel_pacct": # obsoleted by PROC_EVENTS
|
||||
state.parent_map = _parse_pacct(writer, file)
|
||||
- t2 = clock()
|
||||
+ t2 = perf_counter()
|
||||
writer.info(" %s seconds" % str(t2-t1))
|
||||
return state
|
||||
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
diff --git a/pybootchartgui/main.py.in b/pybootchartgui/main.py.in
|
||||
index e809198..164fcf3 100644
|
||||
--- a/pybootchartgui/main.py.in
|
||||
+++ b/pybootchartgui/main.py.in
|
||||
@@ -30,8 +30,10 @@ def _mk_options_parser():
|
||||
usage = "%prog [options] PATH, ..., PATH"
|
||||
version = "%prog v@VER@"
|
||||
parser = optparse.OptionParser(usage, version=version)
|
||||
- parser.add_option("-i", "--interactive", action="store_true", dest="interactive", default=False,
|
||||
- help="start in active mode")
|
||||
+ # PostmarketOS: Remove interactive mode. gui.py would need changes for compatibility
|
||||
+ # with the py3-gobject3 package.
|
||||
+ # parser.add_option("-i", "--interactive", action="store_true", dest="interactive", default=False,
|
||||
+ # help="start in active mode")
|
||||
parser.add_option("-f", "--format", dest="format", default="png", choices=["png", "svg", "pdf"],
|
||||
help="image format (png, svg, pdf); default format png")
|
||||
parser.add_option("-o", "--output", dest="output", metavar="PATH", default=None,
|
||||
@@ -123,10 +125,12 @@ def main(argv=None):
|
||||
|
||||
trace = parsing.Trace(writer, args, options)
|
||||
|
||||
- if options.interactive:
|
||||
- from . import gui
|
||||
- gui.show(trace, options)
|
||||
- elif options.boottime:
|
||||
+ # PostmarketOS: Remove interactive mode
|
||||
+ # if options.interactive:
|
||||
+ # from . import gui
|
||||
+ # gui.show(trace, options)
|
||||
+ #elif options.boottime:
|
||||
+ if options.boottime:
|
||||
import math
|
||||
proc_tree = trace.proc_tree
|
||||
if proc_tree.idle:
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Maintainer: Pops Dylan <popsdylan@protonmail.com>
|
||||
pkgname=bootchart2
|
||||
pkgver=0.14.8_git20170531
|
||||
pkgrel=5
|
||||
pkgver=0.14.9_git20220807
|
||||
pkgrel=0
|
||||
pkgdesc="Boot Process Performance Visualization"
|
||||
url="https://github.com/xrmx/bootchart"
|
||||
arch="all"
|
||||
|
|
@ -9,9 +9,10 @@ license="GPL-2.0-only"
|
|||
depends="python3 py3-cairo"
|
||||
makedepends="$depends_dev sed linux-headers"
|
||||
subpackages="$pkgname-doc"
|
||||
_commit="331ada031f1d65f6d934d918f896e1c708c64bf7"
|
||||
_commit="3d2136d0335718fbe1a8e2370ccbc30123a6e593"
|
||||
source="bootchart-$_commit.tar.gz::https://github.com/xrmx/bootchart/archive/$_commit.tar.gz
|
||||
10-set-EXIT_PROC.patch 20-python3.8.patch 30-disable-interactive-mode.patch"
|
||||
10-set-EXIT_PROC.patch
|
||||
"
|
||||
builddir="$srcdir/bootchart-$_commit"
|
||||
options="!check"
|
||||
|
||||
|
|
@ -30,7 +31,7 @@ package() {
|
|||
done
|
||||
}
|
||||
|
||||
sha512sums="7efd409366679cb50d8fd6b9414f96d115c17f14e01508ac74f845529303bdbdae70ba14adfc89c78e3b11f2da62307c9e1d5e696ea666147c5a89e1222a02d3 bootchart-331ada031f1d65f6d934d918f896e1c708c64bf7.tar.gz
|
||||
sha512sums="
|
||||
ba5deaeff4ee1eac905ed8200dc1fc3157df10eddf2aabe22ec61a5e2ae4300d4b6fd7ab74baaca07e01d1813751f19f206b77441459f166d303634587fdea67 bootchart-3d2136d0335718fbe1a8e2370ccbc30123a6e593.tar.gz
|
||||
0ab20745b0eb360ca1795017f3f2e18b39097f7720816f636d69e91fa01eba7d2fc8971e20d5ab73cff17c89174051982ea8d676319848fb8dee3d2cdbccbd79 10-set-EXIT_PROC.patch
|
||||
816298ad0d586e3272a0dbca298ef8cc758c6b37bdc3ea01746be9dc32987492118da81ff2ea280c4649d35fadd8c644ef332410ccc7a3d7a91288507a22a1d2 20-python3.8.patch
|
||||
2e8abf01a9b5efae93b587c949626d0357db1857da051d5418150df0ac01f62a42606d2af99e4a3934514587748cb30fcf55434cc0940e750b41095897ca5e69 30-disable-interactive-mode.patch"
|
||||
"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue