...
 
Commits (21)
blktrace
========
This package contains two components:
This package contains two components:
- blktrace, the utility to generate traces of a block device
- several utilities (blkrawverify, verify_blkparse, blkparse, btt) to
translate and analyse the data that was generated by blktrace
......@@ -9,10 +9,10 @@ This package contains two components:
The blktrace utility requires root permission, kernel support (a kernel patch
for kernels older than 2.6.17-rc1, and CONFIG_BLK_DEV_IO_TRACE enabled in the
kernel configuration), and a mounted debugfs (mount -t debugfs debugfs
/sys/kernel/debug).
/sys/kernel/debug).
Note specifically that the default Debian kernels prior to 2.6.23-1 do not
have CONFIG_BLK_DEV_IO_TRACE set; you will therefore either need to upgrade to
one of the latest debian kernels, or you'll have to to build your own custom
one of the latest debian kernels, or you'll have to build your own custom
kernel to use the IO trace functionality. Also, the debugfs is not mounted by
default.
......
Document: blktrace-userguide
Title: blktrace User Guide
Author: Alan D. Brunelle
Abstract: This manual describes what blktrace is and how to use it
Section: System/Administration
Format: PDF
Files: /usr/share/doc/blktrace/blktrace.pdf
Document: btrecord-userguid
Title: btrecord and btreplay User Guide
Author: Alan D. Brunelle
Abstract: This manual describes the btrecord and btreplay tools
Section: System/Administration
Format: PDF
Files: /usr/share/doc/blktrace/btreplay.pdf
Document: btt-userguide
Title: btt User Guide
Author: Alan D. Brunelle
Abstract: This manual describes what btt is and how to use it
Section: System/Administration
Format: PDF
Files: /usr/share/doc/blktrace/btt.pdf
# Lintian mistakes mount command example for spelling error
blktrace: spelling-error-in-readme-debian debugfs debugfs (duplicate word) debugfs
# get rid of obsolete init.d script
rm_conffile /etc/init.d/mountdebugfs 1.2.0-1~
#! /bin/sh
# blktrace Mount debugfs on boot
### BEGIN INIT INFO
# Provides: mountdebugfs
# Required-Start: $local_fs $remote_fs mountkernfs
# Required-Stop: $local_fs $remote_fs
# Should-Start:
# Should-Stop:
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Mount debugfs on /sys/kernel/debug
# Description: Mount debugfs on /sys/kernel/debug
### END INIT INFO
# load LSB functions (log_success_msg etc)
. /lib/lsb/init-functions
# main mount point
mount_dir=/sys/kernel/debug
# check if /proc/mounts exists
if ! [ -r /proc/mounts ]
then
log_failure_msg "Failed! Couldn't read /proc/mounts."
exit 1
fi
# no need to do anything if blktrace isn't installed
if ! [ -x /usr/sbin/blktrace ]
then
exit 0
fi
# find where (if anywhere) debugfs is mounted
mountpoints=$(
awk '$3 == "debugfs" { print $2 }' < /proc/mounts
)
mount_debugfs ()
{
# check if any of the current mountpoints is /sys/kernel/debug
found_syskerneldebug=0
for d in $mountpoints
do
if [ $d = $mount_dir ]
then
found_syskerneldebug=1
fi
done
if [ $found_syskerneldebug -eq 1 ]
then
log_success_msg "Debugfs is already mounted on $mount_dir; nothing to do";
exit 0
fi
# check that debugfs is supported by the kernel
if ! [ $( awk -F\\t '$2 == "debugfs" { print $2 }' < /proc/filesystems ) ]
then
log_failure_msg "Can't mount debugfs: not supported by your kernel"
exit 0
fi
# check that /sys/kernel exists
the_dir=$( dirname $mount_dir )
if ! [ -d $the_dir ]
then
log_failure_msg "Can't mount debugfs on $mountdir: $the_dir doesn't exist."
exit 1
fi
# do the actual mounting
if mount -t debugfs debugfs $mount_dir
then
log_success_msg "Mounted debugfs on $mount_dir"
else
log_failure_msg "Couldn't mount debugfs on $mount_dir"
exit 1
fi
}
umount_debugfs ()
{
if [ $mountpoints ]
then
for d in $mountpoints
do
if [ $d = $mount_dir ]
then
if umount $d
then
log_success_msg "Unmounted debugfs from $d"
else
log_failure_msg "Couln't unmount debugfs from $d"
fi
fi
done
else
log_success_msg "Debugfs is not mounted; nothing to do."
fi
}
show_status ()
{
if [ $mountpoints ]
then
for d in $mountpoints
do
log_success_msg "Debugfs is mounted on $d"
done
else
log_success_msg "Debugfs is not mounted"
fi
}
case "$1" in
start)
mount_debugfs
;;
stop)
umount_debugfs
;;
restart|reload|force-reload)
umount_debugfs
exec $0 start
;;
status)
show_status
;;
*)
echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
exit 1
;;
esac
exit 0
blktrace (1.2.0-1) unstable; urgency=medium
* New upstream release
* Update VCS links to salsa.debian.org
* Change SUggests from libav-tools to ffmpeg (Closes: #895915)
* Update Standards-version to version 4.1.4; change priority to optional
* Fix buffer overflow in btt (CVE-2018-10689) (Closes: #897695)
* Fix FTCBFS: (Closes: #894836)
+ Let dh_auto_build pass cross tools to make.
+ Fix build/host confusion.
* Make build reproducible
* Fix typo in README.Debian
* Don't parse changelog during build
* Add doc-base metadata for documentation
* Remove debugfs mounting init script, as systemd is moutning debugfs
by default nowadays (Closes: #873470, #705269)
* Add python3 support for btt_plot.py and bno_plot.py
-- Bas Zoetekouw <bas@debian.org> Sat, 19 May 2018 21:49:22 +0200
blktrace (1.1.0-2) unstable; urgency=low
* Upload to unstable.
......@@ -89,7 +109,7 @@ blktrace (1.0.1-1) unstable; urgency=low
blktrace (0.99.3+git-20080213182518-1) unstable; urgency=low
* New upstream release:
- Added man pages for btreplay and btrecord
- Added man pages for btreplay and btrecord
[obsoletes 15_btreplay_man.patch]
- Separated out g/i/m trace handling and DM-device calculations
- Fix Q counts during requeue and merges
......@@ -103,7 +123,7 @@ blktrace (0.99.3+git-20080213182518-1) unstable; urgency=low
* Renamed bno_plot.py to bno_plot
* Added suggests on gnuplot-x11 (bno_plot needs it)
* Added suggests on python (bno_plot needs it)
* Added man page for bno_plot
* Added man page for bno_plot
[16_bnoplot_man.patch]
* Added information about which Debian kernels have CONFIG_BLK_DEV_IO_TRACE
set to the long description.
......@@ -118,7 +138,7 @@ blktrace (0.99.3+git-20080213182518-1) unstable; urgency=low
blktrace (0.99.3+git-20071207142532-1) unstable; urgency=low
* New upstream release:
- Fix compilation on m68k
- Fix compilation on m68k
[obsoletes 13_m68k_barrier.patch]
- Sync btt manpages with TeX docs
[obsoletes 14_btt_man.patch]
......@@ -148,8 +168,8 @@ blktrace (0~git-20070910192508-1) unstable; urgency=low
- Added man pages
- Misc minor fixes to Makefiles
[obsoletes 12_Makefile_INCS.patch]
- Major revamping of btt:
- major performance boost
- Major revamping of btt:
- major performance boost
- added Q2Q seek distance feature
* Merge changes in btt man page from version 0~git-20070718142546-1
[14_btt_man.patch]
......@@ -160,7 +180,7 @@ blktrace (0~git-20070910192508-1) unstable; urgency=low
blktrace (0~git-20070718142546-2) unstable; urgency=low
* Fix detection of m68k in barrier.h [13_m68k_barrier.patch]
* Fix detection of m68k in barrier.h [13_m68k_barrier.patch]
-- Bas Zoetekouw <bas@debian.org> Sat, 04 Aug 2007 12:03:44 +0200
......
Source: blktrace
Section: utils
Priority: extra
Priority: optional
Maintainer: Bas Zoetekouw <bas@debian.org>
Uploaders: Dmitry Smirnov <onlyjob@debian.org>
Build-Depends:
......@@ -9,19 +9,18 @@ Build-Depends:
libaio-dev,
texlive-latex-base,
texlive-latex-extra
Standards-Version: 3.9.6
Standards-Version: 4.1.4
Homepage: http://brick.kernel.dk/snaps/
Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/blktrace.git
Vcs-Git: git://anonscm.debian.org/collab-maint/blktrace.git
Vcs-Browser: https://salsa.debian.org/debian/blktrace
Vcs-Git: https://salsa.debian.org/debian/blktrace.git
Package: blktrace
Architecture: linux-any
Depends: ${misc:Depends},
${shlibs:Depends},
python,
lsb-base
Depends: ${misc:Depends}
,${shlibs:Depends}
,python3
Recommends: libtheora-bin
,libav-tools
,ffmpeg
,librsvg2-bin
Suggests: gnuplot-x11
Description: utilities for block layer IO tracing
......
Last-Update: 2018-05-16
Forwarded: yes
Author: Jens Axboe <axboe@kernel.dk>
Description: fix CVE-2018-10689: make device/devno use PATH_MAX to avoid overflow. Patch from https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git/commit/?id=d61ff409cb4dda31386373d706ea0cfb1aaac5b7
--- a/btt/devmap.c
+++ b/btt/devmap.c
@@ -23,7 +23,7 @@
struct devmap {
struct list_head head;
- char device[32], devno[32];
+ char device[PATH_MAX], devno[PATH_MAX];
};
LIST_HEAD(all_devmaps);
Last-Update: 2015-03-25
Forwarded: no
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: use avconv instead of ffmpeg
--- a/iowatcher/README
+++ b/iowatcher/README
@@ -15,9 +15,9 @@
rsvg-convert can turn the svgs into many other formats.
Building:
- Type make and make install. We need ffmpeg or png2theora, and
+ Type make and make install. We need avconv or png2theora, and
librsvg to make movies, otherwise there are no dependencies.
The basic options:
@@ -42,9 +42,9 @@
-m Create a movie. The file format depends on the extension used in the
-o filename.* option. If you specify an .ogv or .ogg extension, the
result will be Ogg Theora video, if png2theora is available.
If you use an .mp4 extension, the result will be an mp4 video if
- ffmpeg is avilable. You can use any other extension, but the end
+ avconv is avilable. You can use any other extension, but the end
result will be an mp4.
You can use --movie=spindle or --movie=rect, which changes the
style of the IO mapping.
--- a/iowatcher/iowatcher.1
+++ b/iowatcher/iowatcher.1
@@ -7,9 +7,9 @@
.B iowatcher
\fI[options]\fR [--] \fI[program arguments ...]\fR
.SH DESCRIPTION
-iowatcher graphs the results of a blktrace run. It can graph the result of an existing blktrace, start a new blktrace, or start a new blktrace and a benchmark run. It can then create an image or movie of the IO from a given trace. iowatcher can produce either SVG files or movies in mp4 format (with ffmpeg) or ogg format (with png2theora).
+iowatcher graphs the results of a blktrace run. It can graph the result of an existing blktrace, start a new blktrace, or start a new blktrace and a benchmark run. It can then create an image or movie of the IO from a given trace. iowatcher can produce either SVG files or movies in mp4 format (with avconv) or ogg format (with png2theora).
.SH OPTIONS
.TP
\fB--help\fP
@@ -50,9 +50,9 @@
\fB-m, --movie\fP \fI[style]\fP
Create a movie. The file format depends on the extension used in the \fB-o\fP
\fIfile\fP option. If you specify an .ogv or .ogg extension, the result will
be Ogg Theora video, if png2theora is available. If you use an .mp4 extension,
-the result will be an mp4 video if ffmpeg is available. You can use any other
+the result will be an mp4 video if avconv is available. You can use any other
extension, but the end result will be an mp4. The accepted \fIstyle\fP values
are \fBspindle\fP for a circular disc-like effect (default) or \fBrect\fP for a
rectangular graph style.
.TP
--- a/iowatcher/main.c
+++ b/iowatcher/main.c
@@ -1025,10 +1025,10 @@
}
static void mencode_movie(char *movie_dir)
{
- fprintf(stderr, "Creating movie %s with ffmpeg\n", movie_dir);
- snprintf(line, line_len, "ffmpeg -r 20 -y -i %s/%%10d-%s.svg.png -b:v 250k "
+ fprintf(stderr, "Creating movie %s with avconv\n", movie_dir);
+ snprintf(line, line_len, "avconv -r 20 -y -i %s/%%10d-%s.svg.png -b:v 250k "
"-vcodec %s %s", movie_dir, output_filename, ffmpeg_codec,
output_filename);
system(line);
}
@@ -1331,9 +1331,9 @@
"\t-o (--output): output file name for the SVG image or video\n"
"\t-p (--prog): run a program while blktrace is run\n"
"\t-K (--keep-movie-svgs keep svgs generated for movie mode\n"
"\t-m (--movie [=spindle|rect]): create IO animations\n"
- "\t-C (--codec): ffmpeg codec. Use ffmpeg -codecs to list\n"
+ "\t-C (--codec): avconv codec. Use avconv -codecs to list\n"
"\t-r (--rolling): number of seconds in the rolling averge\n"
"\t-T (--title): graph title\n"
"\t-N (--no-graph): skip a single graph (io, tput, latency, queue_depth, \n"
"\t\t\tiops, cpu-sys, cpu-io, cpu-irq cpu-soft cpu-user)\n"
Last-Update: 2015-03-25
Forwarded: no
Forwarded: yes, 2018-05-20
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: man page lintianisation: hyphen-used-as-minus-sign
--- a/iowatcher/iowatcher.1
+++ b/iowatcher/iowatcher.1
@@ -14,15 +14,15 @@
.TP
--- a/doc/iowatcher.1
+++ b/doc/iowatcher.1
@@ -15,13 +15,13 @@
\fB--help\fP
Print a brief usage summary.
.TP
......@@ -23,9 +22,7 @@ Description: man page lintianisation: hyphen-used-as-minus-sign
Run a program while blktrace is run. The program and its arguments must be
specified after all other options. Note that this option previously required
the program to be given as a single argument but it now tells \fBiowatcher\fP
to expect extra arguments which it should be run during the trace.
@@ -31,69 +31,69 @@
End option parsing. If \fB--prog\fP is specified, everything after \fB--\fP is
@@ -32,10 +32,10 @@
the program to be run. This can be useful if the program name could otherwise
be mistaken for an option.
.TP
......@@ -38,8 +35,7 @@ Description: man page lintianisation: hyphen-used-as-minus-sign
Specify the name of the file or directory in which blktrace output is located.
\fBiowatcher\fP uses a dump from blkparse, so this option tries to guess the
name of the corresponding per-CPU blktrace data files if the dump file doesn't
already exist. To add multiple traces to a given graph, you can specify
\fB--trace\fP more than once. If \fIpath\fP is a directory, \fBiowatcher\fP
@@ -44,10 +44,10 @@
will use the name of the directory as the base name of the dump file and all
trace files found inside the directory will be processed.
.TP
......@@ -52,8 +48,7 @@ Description: man page lintianisation: hyphen-used-as-minus-sign
Create a movie. The file format depends on the extension used in the \fB-o\fP
\fIfile\fP option. If you specify an .ogv or .ogg extension, the result will
be Ogg Theora video, if png2theora is available. If you use an .mp4 extension,
the result will be an mp4 video if avconv is available. You can use any other
extension, but the end result will be an mp4. The accepted \fIstyle\fP values
@@ -56,43 +56,43 @@
are \fBspindle\fP for a circular disc-like effect (default) or \fBrect\fP for a
rectangular graph style.
.TP
......@@ -109,9 +104,7 @@ Description: man page lintianisation: hyphen-used-as-minus-sign
Remove a single graph from the output (see section \fBGRAPHS\fP for options).
This option may be used more than once.
.SH GRAPHS
Values accepted by the \fB-O\fP and \fB-N\fP options are:
@@ -103,39 +103,39 @@
.SH EXAMPLES
@@ -104,37 +104,37 @@
Generate graph from the existing trace.dump:
.PP
.RS
......@@ -155,4 +148,3 @@ Description: man page lintianisation: hyphen-used-as-minus-sign
.RE
.SH AUTHORS
iowatcher was created and is maintained by Chris Mason.
Last-Update: 2015-03-25
Forwarded: no
Forwarded: yes, 2018-05-20
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: "maketitle" insert build date to the document; re-insert original date.
......
Last-Update: 2015-03-25
Forwarded: no
Forwarded: yes, 2018-05-20
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: reduce number of `rsvg-convert` processes to save RAM.
Default 8 may consume ~3...4 GiB and force extensive swapping...
--- a/iowatcher/main.c
+++ b/iowatcher/main.c
@@ -1018,9 +1018,9 @@
@@ -1044,7 +1044,7 @@
static void convert_movie_files(char *movie_dir)
{
fprintf(stderr, "Converting svg files in %s\n", movie_dir);
- snprintf(line, line_len, "find %s -name \\*.svg | xargs -I{} -n 1 -P 8 rsvg-convert -o {}.png {}",
+ snprintf(line, line_len, "find %s -name \\*.svg | xargs -I{} -n 1 -P 4 rsvg-convert -o {}.png {}",
movie_dir);
system(line);
system_check(line);
}
Description: Make python script python3-compatible
Author: Bas Zoetekouw <bas@debian.org>
Origin: other, automatically generated by 2to3
Forwarded: yes, 2018-05-20
Last-Update: 2018-05-20
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/btt/bno_plot.py
+++ b/btt/bno_plot.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
#
# btt blkno plotting interface
#
@@ -38,6 +38,7 @@
To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt.
"""
+from __future__ import print_function
import getopt, glob, os, sys, tempfile
verbose = 0
@@ -60,14 +61,14 @@
try:
(opts, args) = getopt.getopt(in_args, s_opts, l_opts)
- except getopt.error, msg:
- print >>sys.stderr, msg
- print >>sys.stderr, __doc__
+ except getopt.error as msg:
+ print(msg, file=sys.stderr)
+ print(__doc__, file=sys.stderr)
sys.exit(1)
for (o, a) in opts:
if o in ('-h', '--help'):
- print __doc__
+ print(__doc__)
sys.exit(0)
elif o in ('-v', '--verbose'):
verbose += 1
@@ -84,10 +85,10 @@
(bnos, keys_below) = parse_args(sys.argv[1:])
if verbose:
- print 'Using files:',
- for bno in bnos: print bno,
- if keys_below: print '\nKeys are to be placed below graph'
- else: print ''
+ print('Using files:', end=' ')
+ for bno in bnos: print(bno, end=' ')
+ if keys_below: print('\nKeys are to be placed below graph')
+ else: print('')
tmpdir = tempfile.mktemp()
os.mkdir(tmpdir)
@@ -99,7 +100,7 @@
fo = open(t, 'w')
for line in open(f, 'r'):
fld = line.split(None)
- print >>fo, fld[0], fld[1], int(fld[2])-int(fld[1])
+ print(fld[0], fld[1], int(fld[2])-int(fld[1]), file=fo)
fo.close()
t = t[t.rfind('/')+1:]
@@ -107,16 +108,16 @@
else: plot_cmd = "%s,'%s'" % (plot_cmd, t)
fo = open('%s/plot.cmds' % tmpdir, 'w')
- print >>fo, cmds
- if len(bnos) > 10 or keys_below: print >>fo, 'set key below'
- print >>fo, plot_cmd
+ print(cmds, file=fo)
+ if len(bnos) > 10 or keys_below: print('set key below', file=fo)
+ print(plot_cmd, file=fo)
fo.close()
pid = os.fork()
if pid == 0:
cmd = 'gnuplot %s/plot.cmds -' % tmpdir
- if verbose: print 'Executing %s' % cmd
+ if verbose: print('Executing %s' % cmd)
os.chdir(tmpdir)
os.system(cmd)
--- a/btt/btt_plot.py
+++ b/btt/btt_plot.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
#
# btt_plot.py: Generate matplotlib plots for BTT generate data files
#
@@ -18,6 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+from __future__ import print_function
"""
btt_plot.py: Generate matplotlib plots for BTT generated data files
@@ -82,7 +83,7 @@
def fatal(msg):
"""Generate fatal error message and exit"""
- print >>sys.stderr, 'FATAL: %s' % msg
+ print('FATAL: %s' % msg, file=sys.stderr)
sys.exit(1)
#------------------------------------------------------------------------------
@@ -163,7 +164,7 @@
if not os.path.exists(file):
fatal('%s not found' % file)
elif verbose:
- print 'Processing %s' % file
+ print('Processing %s' % file)
xs = []
ys = []
@@ -214,8 +215,8 @@
try:
(opts, args) = getopt.getopt(args[1:], s_opts, l_opts)
- except getopt.error, msg:
- print >>sys.stderr, msg
+ except getopt.error as msg:
+ print(msg, file=sys.stderr)
fatal(__doc__)
for (o, a) in opts:
@@ -293,7 +294,7 @@
def color(idx, style):
"""Returns a color/symbol type based upon the index passed."""
- colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ]
+ colors = [ 'b', 'g', 'r', 'c', 'm', 'y', 'k' ]
l_styles = [ '-', ':', '--', '-.' ]
m_styles = [ 'o', '+', '.', ',', 's', 'v', 'x', '<', '>' ]
@@ -314,7 +315,7 @@
ofile = '%s.png' % type
if verbose:
- print 'Generating plot into %s' % ofile
+ print('Generating plot into %s' % ofile)
fig = plt.figure(figsize=plot_size)
ax = fig.add_subplot(111)
@@ -329,7 +330,7 @@
legends = None
keys = []
- for file in db.iterkeys():
+ for file in db.keys():
if not file in ['min_x', 'max_x', 'min_y', 'max_y']:
keys.append(file)
10_btrace_paths.patch
ffmpeg2avconv.patch
man.patch
pdf-date.patch
procnum.patch
spelling.patch
cve-2018-10689
python3-support.patch
Last-Update: 2012-12-23
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Forwarded: no
Forwarded: yes, 2018-05-20
Description: spelling and hyphen corrections.
--- a/blkiomon.c
......@@ -8,13 +8,13 @@ Description: spelling and hyphen corrections.
@@ -472,13 +472,13 @@
break;
}
if (data_is_native == -1 && check_data_endianness(bit->magic)) {
- fprintf(stderr, "blkiomon: endianess problem\n");
+ fprintf(stderr, "blkiomon: endianness problem\n");
break;
}
- /* endianess */
+ /* endianness */
trace_to_cpu(bit);
......@@ -27,11 +27,11 @@ Description: spelling and hyphen corrections.
.SH EXAMPLES
To get I/O statistics for /dev/sdw every 10 seconds for a period of one hour,
use the following command:
- % blktrace /dev/sdw -a issue -a complete -w 3600 -o - | blkiomon -I 10 -h -
+ % blktrace /dev/sdw \-a issue \-a complete \-w 3600 \-o \- | blkiomon \-I 10 \-h \-
.SH AUTHORS
blkiomon and this man page were written by Martin Peschke.
--- a/doc/blkparse.1
......@@ -39,12 +39,12 @@ Description: spelling and hyphen corrections.
@@ -242,9 +242,9 @@
Same as the back merge, except this i/o ends where a previously inserted
requests starts.
.HP 4
-\fBM --front or back merge\fR
+\fBM -- front or back merge\fR
One of the above
.HP 4
\fBM -- front or back merge\fR
--- a/doc/blktrace.8
......@@ -57,17 +57,17 @@ Description: spelling and hyphen corrections.
-Specifying -o - runs in live mode with blkparse (writing data to standard out).
+Specifying \-o \- runs in live mode with blkparse (writing data to standard out).
.RE
\-D \fIdir\fR
.br
@@ -159,9 +159,9 @@
.RS
Prepend \fIfile\fR to output file name(s)
This only works when supplying a single device, or when piping the output
-via "-o -" with multiple devices.
+via "\-o \-" with multiple devices.
.RE
\-r \fIrel-path\fR
.br
......@@ -2,60 +2,53 @@
#export DH_VERBOSE=1
#DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS )
include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/pkg-info.mk
CFLAGS += -Wall -Wextra -Wno-shadow -g
PKGNAME :=$(word 2,$(shell dpkg-parsechangelog | grep ^Source ) )
FULLVERSION:=$(word 2,$(shell dpkg-parsechangelog | grep ^Version ) )
UPSTREAMVER:=$(shell echo $(FULLVERSION) | sed 's/-[0-9.]\+$$//' | sed 's/^0~//' )
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
# make sure TeX/dvipdfm generates reproducable builds
export FORCE_SOURCE_DATE=1
%:
dh $@
override_dh_auto_build:
ifeq ($(DEB_BUILD_ARCH_OS),linux)
ifeq ($(DEB_HOST_ARCH_OS),linux)
# Building for a Linux-type OS, everything's fine
#
# variables are:
# PKGNAME $(PKGNAME)
# FULLVERSION $(FULLVERSION)
# UPSTREAMVER $(UPSTREAMVER)
# Package name $(DEB_SOURCE)
# Full version $(FULLVERSION)
# Upstream version $(DEB_VERSION_UPSTREAM)
else
####################################################
## Oops, it seems you are trying to build blkutils
## for a non-Linux OS `$(DEB_BUILD_ARCH_OS)'.
## for a non-Linux OS `$(DEB_HOST_ARCH_OS)'.
## This is not supported.
## Please file a bug if you think this is wrong.
####################################################
false
endif
$(MAKE) CFLAGS="$(CPPFLAGS) $(CFLAGS) $(LDFLAGS)" all docs
dh_auto_build -- CFLAGS="$(CPPFLAGS) $(CFLAGS) $(LDFLAGS)" all docs
override_dh_auto_install:
$(MAKE) install \
prefix=/usr \
mandir=\$${prefix}/share/man \
DESTDIR=$(CURDIR)/debian/$(PKGNAME)
DESTDIR=$(CURDIR)/debian/$(DEB_SOURCE)
# move admin-only stuff to /usr/sbin
cd $(CURDIR)/debian/$(PKGNAME) && \
cd $(CURDIR)/debian/$(DEB_SOURCE) && \
mv usr/bin/btrace usr/sbin/ && \
mv usr/bin/blktrace usr/sbin/ && \
mv usr/bin/btreplay usr/sbin/ && \
mv usr/bin/btrecord usr/sbin/
mv usr/bin/btrecord usr/sbin/
# fix name of bno_plot
cd $(CURDIR)/debian/$(PKGNAME) && \
cd $(CURDIR)/debian/$(DEB_SOURCE) && \
mv usr/bin/bno_plot.py usr/bin/bno_plot
override_dh_installinit:
dh_installinit --name=mountdebugfs --no-restart-on-upgrade
override_dh_installdocs:
dh_installdocs
cp -v iowatcher/README $(CURDIR)/debian/$(PKGNAME)/usr/share/doc/$(PKGNAME)/README-iowatcher
override_dh_compress:
dh_compress -X.pdf