From 7824128e72e4bba7b28306727a122bf48aebdebf Mon Sep 17 00:00:00 2001 From: Jan Chren Date: Tue, 21 Jun 2016 23:52:39 +0200 Subject: sys-block/btrace: update - EAPI6 - HOMEPAGE - arm --- sys-block/btrace/btrace-1.1.0-r1.ebuild | 46 +++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 sys-block/btrace/btrace-1.1.0-r1.ebuild (limited to 'sys-block') diff --git a/sys-block/btrace/btrace-1.1.0-r1.ebuild b/sys-block/btrace/btrace-1.1.0-r1.ebuild new file mode 100644 index 000000000000..0278e0ca9889 --- /dev/null +++ b/sys-block/btrace/btrace-1.1.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils toolchain-funcs flag-o-matic linux-info + +MY_PN="blktrace" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" +HOMEPAGE="http://git.kernel.dk/cgit/blktrace/" +SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="doc" + +RDEPEND="dev-libs/libaio" +# This is a Linux specific app! +DEPEND="${RDEPEND} + sys-kernel/linux-headers + doc? ( virtual/latex-base app-text/dvipdfm )" +S="${WORKDIR}/${MY_P}" + +CONFIG_CHECK="~BLK_DEV_IO_TRACE" +WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" + +PATCHES=( "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch ) + +src_compile() { + append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + if use doc; then + export VARTEXFONTS="${T}/fonts" + emake docs + fi +} + +src_install() { + emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" + einstalldocs + use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf +} -- cgit v1.2.3-65-gdbad From 6dd34e5108f51738d11d76b03145ea6257fc7527 Mon Sep 17 00:00:00 2001 From: Jan Chren Date: Wed, 22 Jun 2016 20:37:02 +0200 Subject: sys-block/btrace: rename to sys-block/blktrace --- profiles/updates/2Q-2016 | 1 + sys-block/blktrace/Manifest | 3 + sys-block/blktrace/btrace-1.0.1-r1.ebuild | 46 +++++++++ sys-block/blktrace/btrace-1.0.3.ebuild | 46 +++++++++ sys-block/blktrace/btrace-1.1.0-r1.ebuild | 46 +++++++++ sys-block/blktrace/btrace-1.1.0.ebuild | 46 +++++++++ .../files/btrace-1.0.0-parallel-make.patch | 20 ++++ .../files/btrace-1.0.1-ldflags-parallel-make.patch | 91 ++++++++++++++++++ .../files/btrace-1.1.0-ldflags-parallel-make.patch | 105 +++++++++++++++++++++ sys-block/blktrace/metadata.xml | 7 ++ sys-block/btrace/Manifest | 3 - sys-block/btrace/btrace-1.0.1-r1.ebuild | 46 --------- sys-block/btrace/btrace-1.0.3.ebuild | 46 --------- sys-block/btrace/btrace-1.1.0-r1.ebuild | 46 --------- sys-block/btrace/btrace-1.1.0.ebuild | 46 --------- .../btrace/files/btrace-1.0.0-parallel-make.patch | 20 ---- .../files/btrace-1.0.1-ldflags-parallel-make.patch | 91 ------------------ .../files/btrace-1.1.0-ldflags-parallel-make.patch | 105 --------------------- sys-block/btrace/metadata.xml | 7 -- 19 files changed, 411 insertions(+), 410 deletions(-) create mode 100644 sys-block/blktrace/Manifest create mode 100644 sys-block/blktrace/btrace-1.0.1-r1.ebuild create mode 100644 sys-block/blktrace/btrace-1.0.3.ebuild create mode 100644 sys-block/blktrace/btrace-1.1.0-r1.ebuild create mode 100644 sys-block/blktrace/btrace-1.1.0.ebuild create mode 100644 sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch create mode 100644 sys-block/blktrace/files/btrace-1.0.1-ldflags-parallel-make.patch create mode 100644 sys-block/blktrace/files/btrace-1.1.0-ldflags-parallel-make.patch create mode 100644 sys-block/blktrace/metadata.xml delete mode 100644 sys-block/btrace/Manifest delete mode 100644 sys-block/btrace/btrace-1.0.1-r1.ebuild delete mode 100644 sys-block/btrace/btrace-1.0.3.ebuild delete mode 100644 sys-block/btrace/btrace-1.1.0-r1.ebuild delete mode 100644 sys-block/btrace/btrace-1.1.0.ebuild delete mode 100644 sys-block/btrace/files/btrace-1.0.0-parallel-make.patch delete mode 100644 sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch delete mode 100644 sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch delete mode 100644 sys-block/btrace/metadata.xml (limited to 'sys-block') diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016 index 3f2a8e3cbb1a..4d0589b983f0 100644 --- a/profiles/updates/2Q-2016 +++ b/profiles/updates/2Q-2016 @@ -30,3 +30,4 @@ move kde-base/kdebindings-meta kde-apps/kdebindings-meta move app-crypt/letsencrypt app-crypt/certbot move app-crypt/letsencrypt-apache app-crypt/certbot-apache move net-misc/sx sys-cluster/sx +sys-block/btrace sys-block/blktrace diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest new file mode 100644 index 000000000000..ec19b75ff943 --- /dev/null +++ b/sys-block/blktrace/Manifest @@ -0,0 +1,3 @@ +DIST blktrace-1.0.1.tar.bz2 292208 SHA256 fdd1481a69f14b916f8d835203c1189ee3076d4a5ff88163b6e6b1f27b087f6d SHA512 7faac50dd04ccc0b782f9d2e8909161e42614a348792af736fac8924680ab9eff6d0db0dea9717a0a468577cc03f8bb1314f4d61cb0f0d92423c000fce89c172 WHIRLPOOL 74559960ae7fd6b0eecc9457221f5133f46bbf23e6e096bc96226c85cee49999ae9cf67a3e8bff66722dca7cd43afaf910ac47dfe1d850f83c63e0db6f0ea70d +DIST blktrace-1.0.3.tar.bz2 359325 SHA256 221b66a6008a46bc41b8e455cfb1ba924849ce660ac7c7f9dff0fb64c07becb2 SHA512 f20a33b5309146304277a5f8a4c7f2c61e804b2caa5c62d00425ef26fcd1cd628521067b2502d05c368e10d2cd38a98c246030705ba358f835e8a6921444f9a5 WHIRLPOOL 3de4ef8db992e6b6e697b35ae6a2e47b36e5a9157bc6fafc8fc0de206ee15e3e8ceb4dc3bf70c9dfaae16567bbf4c6d8e81f38a3f1619d804b1a680cbfa1ac81 +DIST blktrace-1.1.0.tar.bz2 395445 SHA256 54a2faaa06dd52fd4a56a6aafa2a251990eb8dcf1832bb8c2fb1fc13a74a9295 SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355 WHIRLPOOL b2777e248533fee8ffe3d92e0311d5797f12f57e188dce94b39e4531b58350ed600a64b50cae590455b52e92b8727c098b56f2c92e58a0567641123201ec9085 diff --git a/sys-block/blktrace/btrace-1.0.1-r1.ebuild b/sys-block/blktrace/btrace-1.0.1-r1.ebuild new file mode 100644 index 000000000000..685308fac28a --- /dev/null +++ b/sys-block/blktrace/btrace-1.0.1-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 + +inherit eutils toolchain-funcs flag-o-matic linux-info + +DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" +HOMEPAGE="https://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/" +MY_PN="blktrace" +MY_P="${MY_PN}-${PV}" +SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="doc" +RDEPEND="" +# This is a Linux specific app! +DEPEND="${RDEPEND} + sys-kernel/linux-headers + doc? ( virtual/latex-base app-text/dvipdfm ) + dev-libs/libaio" +S="${WORKDIR}/${MY_P}" + +CONFIG_CHECK="~BLK_DEV_IO_TRACE" +WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.0.1-ldflags-parallel-make.patch +} + +src_compile() { + append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" + if use doc; then + export VARTEXFONTS="${T}/fonts" + emake docs || die "emake docs failed" + fi +} + +src_install() { + emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed" + dodoc README + use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf +} diff --git a/sys-block/blktrace/btrace-1.0.3.ebuild b/sys-block/blktrace/btrace-1.0.3.ebuild new file mode 100644 index 000000000000..0802676ed20d --- /dev/null +++ b/sys-block/blktrace/btrace-1.0.3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 + +inherit eutils toolchain-funcs flag-o-matic linux-info + +DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" +HOMEPAGE="https://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/" +MY_PN="blktrace" +MY_P="${MY_PN}-${PV}" +SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="doc" +RDEPEND="" +# This is a Linux specific app! +DEPEND="${RDEPEND} + sys-kernel/linux-headers + doc? ( virtual/latex-base app-text/dvipdfm ) + dev-libs/libaio" +S="${WORKDIR}/${MY_P}" + +CONFIG_CHECK="~BLK_DEV_IO_TRACE" +WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.0.1-ldflags-parallel-make.patch +} + +src_compile() { + append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" + if use doc; then + export VARTEXFONTS="${T}/fonts" + emake docs || die "emake docs failed" + fi +} + +src_install() { + emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed" + dodoc README + use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf +} diff --git a/sys-block/blktrace/btrace-1.1.0-r1.ebuild b/sys-block/blktrace/btrace-1.1.0-r1.ebuild new file mode 100644 index 000000000000..0278e0ca9889 --- /dev/null +++ b/sys-block/blktrace/btrace-1.1.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils toolchain-funcs flag-o-matic linux-info + +MY_PN="blktrace" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" +HOMEPAGE="http://git.kernel.dk/cgit/blktrace/" +SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="doc" + +RDEPEND="dev-libs/libaio" +# This is a Linux specific app! +DEPEND="${RDEPEND} + sys-kernel/linux-headers + doc? ( virtual/latex-base app-text/dvipdfm )" +S="${WORKDIR}/${MY_P}" + +CONFIG_CHECK="~BLK_DEV_IO_TRACE" +WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" + +PATCHES=( "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch ) + +src_compile() { + append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + if use doc; then + export VARTEXFONTS="${T}/fonts" + emake docs + fi +} + +src_install() { + emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" + einstalldocs + use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf +} diff --git a/sys-block/blktrace/btrace-1.1.0.ebuild b/sys-block/blktrace/btrace-1.1.0.ebuild new file mode 100644 index 000000000000..23c11b3bd066 --- /dev/null +++ b/sys-block/blktrace/btrace-1.1.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils toolchain-funcs flag-o-matic linux-info + +DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" +HOMEPAGE="https://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/" +MY_PN="blktrace" +MY_P="${MY_PN}-${PV}" +SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc" +RDEPEND="" +# This is a Linux specific app! +DEPEND="${RDEPEND} + sys-kernel/linux-headers + doc? ( virtual/latex-base app-text/dvipdfm ) + dev-libs/libaio" +S="${WORKDIR}/${MY_P}" + +CONFIG_CHECK="~BLK_DEV_IO_TRACE" +WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch +} + +src_compile() { + append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + if use doc; then + export VARTEXFONTS="${T}/fonts" + emake docs + fi +} + +src_install() { + emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" + dodoc README + use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf +} diff --git a/sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch b/sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch new file mode 100644 index 000000000000..d3f42964c2b9 --- /dev/null +++ b/sys-block/blktrace/files/btrace-1.0.0-parallel-make.patch @@ -0,0 +1,20 @@ +diff -Nuar blktrace.orig/Makefile blktrace/Makefile +--- blktrace.orig/Makefile 2008-10-30 07:20:02.000000000 -0700 ++++ blktrace/Makefile 2009-04-12 17:54:46.351588795 -0700 +@@ -10,13 +10,13 @@ + + all: $(ALL) + +-btt/btt: ++btt/btt: $(PROGS) + $(MAKE) -C btt + +-btreplay/btrecord: ++btreplay/btrecord: $(PROGS) + $(MAKE) -C btreplay + +-btreplay/btreplay: ++btreplay/btreplay: $(PROGS) + $(MAKE) -C btreplay + + %.o: %.c diff --git a/sys-block/blktrace/files/btrace-1.0.1-ldflags-parallel-make.patch b/sys-block/blktrace/files/btrace-1.0.1-ldflags-parallel-make.patch new file mode 100644 index 000000000000..40c7d97d5dea --- /dev/null +++ b/sys-block/blktrace/files/btrace-1.0.1-ldflags-parallel-make.patch @@ -0,0 +1,91 @@ +diff -Nuar blktrace-1.0.1.orig/btreplay/Makefile blktrace-1.0.1/btreplay/Makefile +--- blktrace-1.0.1.orig/btreplay/Makefile 2009-05-11 12:00:10.000000000 +0000 ++++ blktrace-1.0.1/btreplay/Makefile 2011-02-03 03:01:41.161365886 +0000 +@@ -32,10 +32,10 @@ + $(CC) $(CFLAGS) -c -o $*.o $< + + btrecord: btrecord.o +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) + + btreplay: btreplay.o +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) + + depend: + @$(CC) -MM $(CFLAGS) *.c 1> .depend +diff -Nuar blktrace-1.0.1.orig/btt/Makefile blktrace-1.0.1/btt/Makefile +--- blktrace-1.0.1.orig/btt/Makefile 2009-05-11 12:00:10.000000000 +0000 ++++ blktrace-1.0.1/btt/Makefile 2011-02-03 03:01:41.161365886 +0000 +@@ -38,7 +38,7 @@ + $(CC) $(CFLAGS) -c -o $*.o $< + + btt: $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) + + ifneq ($(wildcard .depend),) + include .depend +diff -Nuar blktrace-1.0.1.orig/Makefile blktrace-1.0.1/Makefile +--- blktrace-1.0.1.orig/Makefile 2009-05-11 12:00:10.000000000 +0000 ++++ blktrace-1.0.1/Makefile 2011-02-03 03:03:32.713725832 +0000 +@@ -4,38 +4,35 @@ + PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon + LIBS = -lpthread + SCRIPTS = btrace ++SUBDIRS = btreplay btt + +-ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \ ++ALL = $(PROGS) $(SCRIPTS) ++INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \ + btt/bno_plot.py + +-all: $(ALL) ++all: $(ALL) $(SUBDIRS) ++.PHONY: $(SUBDIRS) + +-btt/btt: +- $(MAKE) -C btt +- +-btreplay/btrecord: +- $(MAKE) -C btreplay +- +-btreplay/btreplay: +- $(MAKE) -C btreplay ++$(SUBDIRS): $(PROGS) ++ $(MAKE) -C $@ + + %.o: %.c + $(CC) -o $*.o -c $(ALL_CFLAGS) $< + + blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) + + blktrace: blktrace.o act_mask.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) + + verify_blkparse: verify_blkparse.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) + + blkrawverify: blkrawverify.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) + + blkiomon: blkiomon.o rbtree.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt + + $(PROGS): | depend + +@@ -81,7 +78,7 @@ + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) + $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8 +- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir) ++ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir) + $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8 + diff --git a/sys-block/blktrace/files/btrace-1.1.0-ldflags-parallel-make.patch b/sys-block/blktrace/files/btrace-1.1.0-ldflags-parallel-make.patch new file mode 100644 index 000000000000..f26799238feb --- /dev/null +++ b/sys-block/blktrace/files/btrace-1.1.0-ldflags-parallel-make.patch @@ -0,0 +1,105 @@ +--- blktrace-1.1.0/btreplay/Makefile ++++ blktrace-1.1.0/btreplay/Makefile +@@ -32,10 +32,10 @@ + $(CC) $(CFLAGS) -c -o $*.o $< + + btrecord: btrecord.o +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) + + btreplay: btreplay.o +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) + + depend: + @$(CC) -MM $(CFLAGS) *.c 1> .depend +--- blktrace-1.1.0/btt/Makefile ++++ blktrace-1.1.0/btt/Makefile +@@ -38,7 +38,7 @@ + $(CC) $(CFLAGS) -c -o $*.o $< + + btt: $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) + + ifneq ($(wildcard .depend),) + include .depend +--- blktrace-1.1.0/iowatcher/Makefile ++++ blktrace-1.1.0/iowatcher/Makefile +@@ -19,7 +19,7 @@ + $(CC) -o $*.o -c $(ALL_CFLAGS) $< + + iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) -lm + + depend: + @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend +--- blktrace-1.1.0/Makefile ++++ blktrace-1.1.0/Makefile +@@ -4,41 +4,35 @@ + PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon + LIBS = -lpthread + SCRIPTS = btrace ++SUBDIRS = btreplay btt iowatcher + +-ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \ ++ALL = $(PROGS) $(SCRIPTS) ++INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \ + btt/bno_plot.py iowatcher/iowatcher + +-all: $(ALL) ++all: $(ALL) $(SUBDIRS) ++.PHONY: $(SUBDIRS) + +-btt/btt: +- $(MAKE) -C btt +- +-iowatcher/iowatcher: +- $(MAKE) -C iowatcher +- +-btreplay/btrecord: +- $(MAKE) -C btreplay +- +-btreplay/btreplay: +- $(MAKE) -C btreplay ++$(SUBDIRS): $(PROGS) ++ $(MAKE) -C $@ + + %.o: %.c + $(CC) -o $*.o -c $(ALL_CFLAGS) $< + + blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) + + blktrace: blktrace.o act_mask.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) + + verify_blkparse: verify_blkparse.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) + + blkrawverify: blkrawverify.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) + + blkiomon: blkiomon.o rbtree.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt ++ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt + + $(PROGS): | depend + +@@ -84,9 +78,10 @@ + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) + $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8 +- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir) ++ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir) + $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8 ++ $(INSTALL) -m 644 iowatcher/*.1 $(DESTDIR)$(mandir)/man1 + + ifneq ($(wildcard .depend),) + include .depend diff --git a/sys-block/blktrace/metadata.xml b/sys-block/blktrace/metadata.xml new file mode 100644 index 000000000000..79d462e85571 --- /dev/null +++ b/sys-block/blktrace/metadata.xml @@ -0,0 +1,7 @@ + + + + + robbat2@gentoo.org + + diff --git a/sys-block/btrace/Manifest b/sys-block/btrace/Manifest deleted file mode 100644 index ec19b75ff943..000000000000 --- a/sys-block/btrace/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST blktrace-1.0.1.tar.bz2 292208 SHA256 fdd1481a69f14b916f8d835203c1189ee3076d4a5ff88163b6e6b1f27b087f6d SHA512 7faac50dd04ccc0b782f9d2e8909161e42614a348792af736fac8924680ab9eff6d0db0dea9717a0a468577cc03f8bb1314f4d61cb0f0d92423c000fce89c172 WHIRLPOOL 74559960ae7fd6b0eecc9457221f5133f46bbf23e6e096bc96226c85cee49999ae9cf67a3e8bff66722dca7cd43afaf910ac47dfe1d850f83c63e0db6f0ea70d -DIST blktrace-1.0.3.tar.bz2 359325 SHA256 221b66a6008a46bc41b8e455cfb1ba924849ce660ac7c7f9dff0fb64c07becb2 SHA512 f20a33b5309146304277a5f8a4c7f2c61e804b2caa5c62d00425ef26fcd1cd628521067b2502d05c368e10d2cd38a98c246030705ba358f835e8a6921444f9a5 WHIRLPOOL 3de4ef8db992e6b6e697b35ae6a2e47b36e5a9157bc6fafc8fc0de206ee15e3e8ceb4dc3bf70c9dfaae16567bbf4c6d8e81f38a3f1619d804b1a680cbfa1ac81 -DIST blktrace-1.1.0.tar.bz2 395445 SHA256 54a2faaa06dd52fd4a56a6aafa2a251990eb8dcf1832bb8c2fb1fc13a74a9295 SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355 WHIRLPOOL b2777e248533fee8ffe3d92e0311d5797f12f57e188dce94b39e4531b58350ed600a64b50cae590455b52e92b8727c098b56f2c92e58a0567641123201ec9085 diff --git a/sys-block/btrace/btrace-1.0.1-r1.ebuild b/sys-block/btrace/btrace-1.0.1-r1.ebuild deleted file mode 100644 index 685308fac28a..000000000000 --- a/sys-block/btrace/btrace-1.0.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -inherit eutils toolchain-funcs flag-o-matic linux-info - -DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" -HOMEPAGE="https://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/" -MY_PN="blktrace" -MY_P="${MY_PN}-${PV}" -SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="doc" -RDEPEND="" -# This is a Linux specific app! -DEPEND="${RDEPEND} - sys-kernel/linux-headers - doc? ( virtual/latex-base app-text/dvipdfm ) - dev-libs/libaio" -S="${WORKDIR}/${MY_P}" - -CONFIG_CHECK="~BLK_DEV_IO_TRACE" -WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.1-ldflags-parallel-make.patch -} - -src_compile() { - append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" - if use doc; then - export VARTEXFONTS="${T}/fonts" - emake docs || die "emake docs failed" - fi -} - -src_install() { - emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed" - dodoc README - use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf -} diff --git a/sys-block/btrace/btrace-1.0.3.ebuild b/sys-block/btrace/btrace-1.0.3.ebuild deleted file mode 100644 index 0802676ed20d..000000000000 --- a/sys-block/btrace/btrace-1.0.3.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -inherit eutils toolchain-funcs flag-o-matic linux-info - -DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" -HOMEPAGE="https://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/" -MY_PN="blktrace" -MY_P="${MY_PN}-${PV}" -SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="doc" -RDEPEND="" -# This is a Linux specific app! -DEPEND="${RDEPEND} - sys-kernel/linux-headers - doc? ( virtual/latex-base app-text/dvipdfm ) - dev-libs/libaio" -S="${WORKDIR}/${MY_P}" - -CONFIG_CHECK="~BLK_DEV_IO_TRACE" -WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.0.1-ldflags-parallel-make.patch -} - -src_compile() { - append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" - if use doc; then - export VARTEXFONTS="${T}/fonts" - emake docs || die "emake docs failed" - fi -} - -src_install() { - emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed" - dodoc README - use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf -} diff --git a/sys-block/btrace/btrace-1.1.0-r1.ebuild b/sys-block/btrace/btrace-1.1.0-r1.ebuild deleted file mode 100644 index 0278e0ca9889..000000000000 --- a/sys-block/btrace/btrace-1.1.0-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit eutils toolchain-funcs flag-o-matic linux-info - -MY_PN="blktrace" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" -HOMEPAGE="http://git.kernel.dk/cgit/blktrace/" -SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~arm ~ppc ~x86" -IUSE="doc" - -RDEPEND="dev-libs/libaio" -# This is a Linux specific app! -DEPEND="${RDEPEND} - sys-kernel/linux-headers - doc? ( virtual/latex-base app-text/dvipdfm )" -S="${WORKDIR}/${MY_P}" - -CONFIG_CHECK="~BLK_DEV_IO_TRACE" -WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" - -PATCHES=( "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch ) - -src_compile() { - append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - if use doc; then - export VARTEXFONTS="${T}/fonts" - emake docs - fi -} - -src_install() { - emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" - einstalldocs - use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf -} diff --git a/sys-block/btrace/btrace-1.1.0.ebuild b/sys-block/btrace/btrace-1.1.0.ebuild deleted file mode 100644 index 23c11b3bd066..000000000000 --- a/sys-block/btrace/btrace-1.1.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs flag-o-matic linux-info - -DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue" -HOMEPAGE="https://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/" -MY_PN="blktrace" -MY_P="${MY_PN}-${PV}" -SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="doc" -RDEPEND="" -# This is a Linux specific app! -DEPEND="${RDEPEND} - sys-kernel/linux-headers - doc? ( virtual/latex-base app-text/dvipdfm ) - dev-libs/libaio" -S="${WORKDIR}/${MY_P}" - -CONFIG_CHECK="~BLK_DEV_IO_TRACE" -WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.1.0-ldflags-parallel-make.patch -} - -src_compile() { - append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - if use doc; then - export VARTEXFONTS="${T}/fonts" - emake docs - fi -} - -src_install() { - emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" - dodoc README - use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf -} diff --git a/sys-block/btrace/files/btrace-1.0.0-parallel-make.patch b/sys-block/btrace/files/btrace-1.0.0-parallel-make.patch deleted file mode 100644 index d3f42964c2b9..000000000000 --- a/sys-block/btrace/files/btrace-1.0.0-parallel-make.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nuar blktrace.orig/Makefile blktrace/Makefile ---- blktrace.orig/Makefile 2008-10-30 07:20:02.000000000 -0700 -+++ blktrace/Makefile 2009-04-12 17:54:46.351588795 -0700 -@@ -10,13 +10,13 @@ - - all: $(ALL) - --btt/btt: -+btt/btt: $(PROGS) - $(MAKE) -C btt - --btreplay/btrecord: -+btreplay/btrecord: $(PROGS) - $(MAKE) -C btreplay - --btreplay/btreplay: -+btreplay/btreplay: $(PROGS) - $(MAKE) -C btreplay - - %.o: %.c diff --git a/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch b/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch deleted file mode 100644 index 40c7d97d5dea..000000000000 --- a/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -Nuar blktrace-1.0.1.orig/btreplay/Makefile blktrace-1.0.1/btreplay/Makefile ---- blktrace-1.0.1.orig/btreplay/Makefile 2009-05-11 12:00:10.000000000 +0000 -+++ blktrace-1.0.1/btreplay/Makefile 2011-02-03 03:01:41.161365886 +0000 -@@ -32,10 +32,10 @@ - $(CC) $(CFLAGS) -c -o $*.o $< - - btrecord: btrecord.o -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - btreplay: btreplay.o -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - depend: - @$(CC) -MM $(CFLAGS) *.c 1> .depend -diff -Nuar blktrace-1.0.1.orig/btt/Makefile blktrace-1.0.1/btt/Makefile ---- blktrace-1.0.1.orig/btt/Makefile 2009-05-11 12:00:10.000000000 +0000 -+++ blktrace-1.0.1/btt/Makefile 2011-02-03 03:01:41.161365886 +0000 -@@ -38,7 +38,7 @@ - $(CC) $(CFLAGS) -c -o $*.o $< - - btt: $(OBJS) -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - ifneq ($(wildcard .depend),) - include .depend -diff -Nuar blktrace-1.0.1.orig/Makefile blktrace-1.0.1/Makefile ---- blktrace-1.0.1.orig/Makefile 2009-05-11 12:00:10.000000000 +0000 -+++ blktrace-1.0.1/Makefile 2011-02-03 03:03:32.713725832 +0000 -@@ -4,38 +4,35 @@ - PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon - LIBS = -lpthread - SCRIPTS = btrace -+SUBDIRS = btreplay btt - --ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \ -+ALL = $(PROGS) $(SCRIPTS) -+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \ - btt/bno_plot.py - --all: $(ALL) -+all: $(ALL) $(SUBDIRS) -+.PHONY: $(SUBDIRS) - --btt/btt: -- $(MAKE) -C btt -- --btreplay/btrecord: -- $(MAKE) -C btreplay -- --btreplay/btreplay: -- $(MAKE) -C btreplay -+$(SUBDIRS): $(PROGS) -+ $(MAKE) -C $@ - - %.o: %.c - $(CC) -o $*.o -c $(ALL_CFLAGS) $< - - blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blktrace: blktrace.o act_mask.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - verify_blkparse: verify_blkparse.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blkrawverify: blkrawverify.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blkiomon: blkiomon.o rbtree.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt - - $(PROGS): | depend - -@@ -81,7 +78,7 @@ - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8 -- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir) - $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8 - diff --git a/sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch b/sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch deleted file mode 100644 index f26799238feb..000000000000 --- a/sys-block/btrace/files/btrace-1.1.0-ldflags-parallel-make.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- blktrace-1.1.0/btreplay/Makefile -+++ blktrace-1.1.0/btreplay/Makefile -@@ -32,10 +32,10 @@ - $(CC) $(CFLAGS) -c -o $*.o $< - - btrecord: btrecord.o -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - btreplay: btreplay.o -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - depend: - @$(CC) -MM $(CFLAGS) *.c 1> .depend ---- blktrace-1.1.0/btt/Makefile -+++ blktrace-1.1.0/btt/Makefile -@@ -38,7 +38,7 @@ - $(CC) $(CFLAGS) -c -o $*.o $< - - btt: $(OBJS) -- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - ifneq ($(wildcard .depend),) - include .depend ---- blktrace-1.1.0/iowatcher/Makefile -+++ blktrace-1.1.0/iowatcher/Makefile -@@ -19,7 +19,7 @@ - $(CC) -o $*.o -c $(ALL_CFLAGS) $< - - iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) -lm - - depend: - @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend ---- blktrace-1.1.0/Makefile -+++ blktrace-1.1.0/Makefile -@@ -4,41 +4,35 @@ - PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon - LIBS = -lpthread - SCRIPTS = btrace -+SUBDIRS = btreplay btt iowatcher - --ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \ -+ALL = $(PROGS) $(SCRIPTS) -+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \ - btt/bno_plot.py iowatcher/iowatcher - --all: $(ALL) -+all: $(ALL) $(SUBDIRS) -+.PHONY: $(SUBDIRS) - --btt/btt: -- $(MAKE) -C btt -- --iowatcher/iowatcher: -- $(MAKE) -C iowatcher -- --btreplay/btrecord: -- $(MAKE) -C btreplay -- --btreplay/btreplay: -- $(MAKE) -C btreplay -+$(SUBDIRS): $(PROGS) -+ $(MAKE) -C $@ - - %.o: %.c - $(CC) -o $*.o -c $(ALL_CFLAGS) $< - - blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blktrace: blktrace.o act_mask.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) - - verify_blkparse: verify_blkparse.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blkrawverify: blkrawverify.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) - - blkiomon: blkiomon.o rbtree.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt -+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt - - $(PROGS): | depend - -@@ -84,9 +78,10 @@ - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8 -- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir) - $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1 - $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8 -+ $(INSTALL) -m 644 iowatcher/*.1 $(DESTDIR)$(mandir)/man1 - - ifneq ($(wildcard .depend),) - include .depend diff --git a/sys-block/btrace/metadata.xml b/sys-block/btrace/metadata.xml deleted file mode 100644 index 79d462e85571..000000000000 --- a/sys-block/btrace/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - robbat2@gentoo.org - - -- cgit v1.2.3-65-gdbad