Add rpm and deb packaging for bcc-tools

Signed-off-by: Brenden Blanco <bblanco@plumgrid.com>

diff --git a/SPECS/bcc.spec b/SPECS/bcc.spec
index 0543ed4..0965089 100644 (file)
--- 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 <bblanco@plumgrid.com> - 0.1.3-1
+- Add bcc-tools package
+
 * Mon Oct 12 2015 Brenden Blanco <bblanco@plumgrid.com> - 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
new file mode 100644 (file)
index 0000000..115a22d
--- /dev/null
+++ 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
index 40bfe6b..2474d9f 100644 (file)
--- 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/tools/CMakeLists.txt b/tools/CMakeLists.txt
index c9b2345..8b76a42 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -8,4 +8,4 @@ set(EXAMPLE_FILES biolatency_example.txt funclatency_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/doc/tools)
+install(FILES ${EXAMPLE_FILES} DESTINATION share/bcc/tools/doc)