| 1 |
commit: bf4fceea4680d3e25627149c1b0ffba102e2ab33 |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Wed Mar 13 21:12:07 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 13 21:12:25 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4fceea |
| 7 |
|
| 8 |
dev-util/bcc: Make 0.9.0 work with <5.0 kernels, add maintainer |
| 9 |
|
| 10 |
The 0.9.0 release requires bpf.h from 5.0 kernels to compile, but will |
| 11 |
otherwise work on 4.18+ kernels. This adds a patch that just patches in |
| 12 |
the 5.0 version of bpf.h when linux-headers is less than 5.0. |
| 13 |
|
| 14 |
Copyright: Sony Interactive Entertainment Inc. |
| 15 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 16 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-util/bcc/Manifest | 1 + |
| 19 |
dev-util/bcc/bcc-0.9.0-r1.ebuild | 11 ++++++++++- |
| 20 |
dev-util/bcc/metadata.xml | 3 +++ |
| 21 |
3 files changed, 14 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest |
| 24 |
index a4b0f0db8d9..136c3b7aa67 100644 |
| 25 |
--- a/dev-util/bcc/Manifest |
| 26 |
+++ b/dev-util/bcc/Manifest |
| 27 |
@@ -1,3 +1,4 @@ |
| 28 |
DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b236e78cd111be27b3482849965600a1d574f59243917672f00bb3cef65cab63103f6c4a5cf62024c683d9b SHA512 1a8edf6da22f3119a74cf43f03ec83b97ed2f6fc18828d750d8a695ac1451b6b3209e5d2cf48bc87f53fa9447e8813a018a58d31588d477e4aa364a2d0217e80 |
| 29 |
DIST bcc-0.7.0.tar.gz 2009289 BLAKE2B 370b553521289d983d1165633e76a5e405250b9b09dbf3e78c127d232908e73facce06097ce4dbf0bbccda929b6715a9b7460affe123556087c8ca00b8d62c0b SHA512 ebe6c4cbecba2d587c69af71ddc8cb451b2b8e1d49ef887f291c813320c2c60d49357500fc2751d5b418df2be1d02763c385d89de6efa6e10f049c25acf01b4e |
| 30 |
+DIST bcc-0.9.0-linux-5-bpf.patch.xz 28524 BLAKE2B f0369e50eabd7b1eb9a492b9652cd7647c7c7fda3b01db1e7f2bf716e76357d07d67193b31189b98309e26895ac3dd5c755d4cef6bc592e4674f40710c33539c SHA512 fc5b828a5826da2cf1e1a76758c635f5443d202aecbe3f269d78abcaa0117ad7658bea6c43e7b60e1ecc6bcc65bd19b100217758a1203d278ddb03c5837c43f1 |
| 31 |
DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786c4fcca3a83dea03bc76949f958dd24f7d85feb2e3402576410f965754f3d031076486b7d378493c56035e8 SHA512 373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091 |
| 32 |
|
| 33 |
diff --git a/dev-util/bcc/bcc-0.9.0-r1.ebuild b/dev-util/bcc/bcc-0.9.0-r1.ebuild |
| 34 |
index 421f8729ea5..f23a490a902 100644 |
| 35 |
--- a/dev-util/bcc/bcc-0.9.0-r1.ebuild |
| 36 |
+++ b/dev-util/bcc/bcc-0.9.0-r1.ebuild |
| 37 |
@@ -10,7 +10,8 @@ inherit cmake-utils linux-info python-single-r1 python-utils-r1 |
| 38 |
DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" |
| 39 |
HOMEPAGE="https://iovisor.github.io/bcc/" |
| 40 |
EGIT_COMMIT="v${PV}" |
| 41 |
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" |
| 42 |
+SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz |
| 43 |
+ mirror://gentoo/bcc-0.9.0-linux-5-bpf.patch.xz" |
| 44 |
RESTRICT="test" |
| 45 |
|
| 46 |
LICENSE="Apache-2.0" |
| 47 |
@@ -49,6 +50,14 @@ pkg_setup() { |
| 48 |
python-single-r1_pkg_setup |
| 49 |
} |
| 50 |
|
| 51 |
+src_prepare() { |
| 52 |
+ # needs bpf.h from linux-5.0 to build |
| 53 |
+ has_version '>=sys-kernel/linux-headers-5.0' || \ |
| 54 |
+ eapply "${WORKDIR}/bcc-0.9.0-linux-5-bpf.patch" |
| 55 |
+ |
| 56 |
+ cmake-utils_src_prepare |
| 57 |
+} |
| 58 |
+ |
| 59 |
src_configure() { |
| 60 |
local mycmakeargs=( |
| 61 |
-DREVISION=${PV%%_*} |
| 62 |
|
| 63 |
diff --git a/dev-util/bcc/metadata.xml b/dev-util/bcc/metadata.xml |
| 64 |
index 43eb746c3b0..4611e015755 100644 |
| 65 |
--- a/dev-util/bcc/metadata.xml |
| 66 |
+++ b/dev-util/bcc/metadata.xml |
| 67 |
@@ -4,6 +4,9 @@ |
| 68 |
<maintainer type="person"> |
| 69 |
<email>zmedico@g.o</email> |
| 70 |
</maintainer> |
| 71 |
+ <maintainer type="person"> |
| 72 |
+ <email>chutzpah@g.o</email> |
| 73 |
+ </maintainer> |
| 74 |
<upstream> |
| 75 |
<remote-id type="github">iovisor/bcc</remote-id> |
| 76 |
</upstream> |
Archives