Merge pull request iovisor#296 from iovisor/bblanco_dev

Add bcc-tools package
mwesolowski · Nov 30, 2015 · 1c7debd · 1c7debd
2 parents e9a7184 + f7c226d
commit 1c7debd
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,5 +44,7 @@ set(CMAKE_CXX_FLAGS "-std=c++11 -Wall")
 endif()
 
 add_subdirectory(examples)
+add_subdirectory(man)
 add_subdirectory(src)
 add_subdirectory(tests)
+add_subdirectory(tools)
diff --git a/SPECS/bcc.spec b/SPECS/bcc.spec
@@ -34,6 +34,9 @@ pushd build
 make install/strip DESTDIR=%{buildroot}
 
 %changelog
+* Sun Nov 29 2015 Brenden Blanco <[email protected]> - 0.1.3-1
+- Add bcc-tools package
+
 * Mon Oct 12 2015 Brenden Blanco <[email protected]> - 0.1.2-1
 - Add better version numbering into libbcc.so
 
@@ -56,6 +59,11 @@ Summary: Python bindings for BPF Compiler Collection (BCC)
 %description -n python-bcc
 Python bindings for BPF Compiler Collection (BCC)
 
+%package -n bcc-tools
+Summary: Command line tools for BPF Compiler Collection (BCC)
+%description -n bcc-tools
+Command line tools for BPF Compiler Collection (BCC)
+
 %files -n python-bcc
 %{python_sitelib}/bcc*
 
@@ -72,3 +80,7 @@ Python bindings for BPF Compiler Collection (BCC)
 %exclude /usr/share/bcc/examples/*/*.pyo
 %exclude /usr/share/bcc/examples/*/*/*.pyc
 %exclude /usr/share/bcc/examples/*/*/*.pyo
+
+%files -n bcc-tools
+/usr/share/bcc/tools/*
+/usr/share/bcc/man/*
diff --git a/debian/bcc-tools.install b/debian/bcc-tools.install
@@ -0,0 +1,2 @@
+usr/share/bcc/tools/*
+usr/share/bcc/man/*
diff --git a/debian/control b/debian/control
@@ -22,3 +22,8 @@ Package: python-bcc
 Architecture: all
 Depends: libbcc, python
 Description: Python wrappers for BPF Compiler Collection (BCC)
+
+Package: bcc-tools
+Architecture: amd64
+Depends: libbcc, python
+Description: Command line tools for BPF Compiler Collection (BCC)
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(man8)
diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(FILES biolatency.8 biosnoop.8 funccount.8 funclatency.8 hardirqs.8
+ killsnoop.8 opensnoop.8 pidpersec.8 softirqs.8 syncsnoop.8 tcpaccept.8
+ tcpconnect.8 vfscount.8 vfsstat.8)
+install(FILES ${FILES} DESTINATION share/bcc/man/man8)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(PROGRAMS biolatency biosnoop funccount funclatency hardirqs killsnoop
+ opensnoop pidpersec softirqs syncsnoop tcpaccept tcpconnect vfscount vfsstat)
+set(C_FILES pidpersec.c vfscount.c vfsstat.c)
+set(EXAMPLE_FILES biolatency_example.txt funclatency_example.txt
+ killsnoop_example.txt pidpersec_example.txt syncsnoop_example.txt
+ tcpconnect_example.txt vfsstat_example.txt biosnoop_example.txt
+ funccount_example.txt hardirqs_example.txt opensnoop_example.txt
+ softirqs_example.txt tcpaccept_example.txt vfscount_example.txt)
+install(PROGRAMS ${PROGRAMS} DESTINATION share/bcc/tools)
+install(FILES ${C_FILES} DESTINATION share/bcc/tools)
+install(FILES ${EXAMPLE_FILES} DESTINATION share/bcc/tools/doc)