new version 0.1.8

4 files changed, 20 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cae5d9b64345..d4ce629e67e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jan 24 19:36:41 UTC 2016
+# Thu Feb 25 00:27:01 UTC 2016
 pkgbase = bcc
 	pkgdesc = BPF Compiler Collection
-	pkgver = 0.1.7
-	pkgrel = 4
+	pkgver = 0.1.8
+	pkgrel = 1
 	url = https://github.com/iovisor/bcc
 	arch = x86_64
 	license = Apache
@@ -15,12 +15,8 @@ pkgbase = bcc
 	makedepends = python
 	makedepends = python2
 	conflicts = bcc-git
-	source = https://github.com/iovisor/bcc/archive/v0.1.7.tar.gz
-	source = cmake_version-cmake.patch
-	source = src_python_CMakeLists-txt.patch
-	sha256sums = c8416778324de818c02dd33f33a6a0b9ad0fc941ee88ad002a09919ecaaccd16
-	sha256sums = SKIP
-	sha256sums = SKIP
+	source = https://github.com/iovisor/bcc/archive/v0.1.8.tar.gz
+	sha256sums = 7535d0dec063454a858337dd07211ad2a207f8fa5665a3fad166f38415e50d70
 
 pkgname = bcc
 	pkgdesc = BPF Compiler Collection - C library and examples
diff --git a/PKGBUILD b/PKGBUILD
index 2e31bf46ae00..36c65bee77b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=bcc
 pkgname=('bcc' 'bcc-tools' 'python-bcc' 'python2-bcc')
-pkgver=0.1.7
-pkgrel=4
+pkgver=0.1.8
+pkgrel=1
 pkgdesc="BPF Compiler Collection"
 arch=('x86_64')
 url="https://github.com/iovisor/bcc"
@@ -11,19 +11,8 @@ license=('Apache')
 conflicts=('bcc-git')
 makedepends=('cmake' 'clang>=3.7.0' 'llvm>=3.7.0' 'flex' 'bison' 'python'
              'python2')
-source=("https://github.com/iovisor/${pkgname}/archive/v${pkgver}.tar.gz"
-        "cmake_version-cmake.patch"
-        "src_python_CMakeLists-txt.patch")
-sha256sums=('c8416778324de818c02dd33f33a6a0b9ad0fc941ee88ad002a09919ecaaccd16'
-           'SKIP'
-           'SKIP')
-
-prepare() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  # these two are already fixed in git, 0.1.8 release should have them
-  patch -p0 < "${srcdir}/cmake_version-cmake.patch"
-  patch -p0 < "${srcdir}/src_python_CMakeLists-txt.patch"
-}
+source=("https://github.com/iovisor/${pkgname}/archive/v${pkgver}.tar.gz")
+sha256sums=('7535d0dec063454a858337dd07211ad2a207f8fa5665a3fad166f38415e50d70')
 
 build() {
   # make sure repetitive builds are clean
@@ -48,10 +37,15 @@ package_bcc() {
               'python-bcc: Python 3 bindings for BCC'
               'python2-bcc: Python 2 bindings for BCC')
 
-  # everything except the python bindings
+  # this installs the kitchen sink
   cd "${srcdir}/${pkgbase}-${pkgver}/build"
   make DESTDIR="${pkgdir}/" install
+
+  # these go in a split package python*-bcc
   rm -rf "${pkgdir}"/usr/lib/python*
+
+  # these go in a split package bcc-tools
+  rm -rf "${pkgdir}"/usr/share/bcc/{tools,man}
 }
 
 package_bcc-tools() {
@@ -61,15 +55,12 @@ package_bcc-tools() {
   optdepends=('python-bcc: Python 3 bindings for BCC'
               'python2-bcc: Python 2 bindings for BCC')
 
-  # https://github.com/iovisor/bcc/issues/291
-  mkdir -p "${pkgdir}/usr/share/${pkgbase}"
-  cp -a "${srcdir}/${pkgbase}-${pkgver}/tools" \
-    "${pkgdir}/usr/share/${pkgbase}/"
+  cd "${srcdir}/${pkgbase}-${pkgver}/build/tools"
+  make DESTDIR="${pkgdir}/" install
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/build/man"
+  make DESTDIR="${pkgdir}/" install
 
-  # these conflict with perf-tools for now as well
-  mkdir -p "${pkgdir}/usr/share/${pkgbase}/man"
-  cp -a "${srcdir}/${pkgbase}-${pkgver}/man/man8" \
-    "${pkgdir}/usr/share/${pkgbase}/man/"
 }
 
 package_python-bcc() {
diff --git a/cmake_version-cmake.patch b/cmake_version-cmake.patch
deleted file mode 100644
index 1c6b4e1fd0ce..000000000000
--- a/cmake_version-cmake.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- cmake/version.cmake.orig	2015-10-12 11:59:13.000000000 -0500
-+++ cmake/version.cmake	2015-11-08 13:49:16.974537510 -0600
-@@ -1,11 +1,11 @@
- # Copyright (c) PLUMgrid, Inc.
- # Licensed under the Apache License, Version 2.0 (the "License")
--get_git_head_revision(GIT_REFSPEC GIT_SHA1)
--string(SUBSTRING "${GIT_SHA1}" 0 8 GIT_SHA1_SHORT)
--git_describe(GIT_DESCRIPTION)
--git_describe(GIT_TAG_LAST "--abbrev=0")
--git_get_exact_tag(GIT_TAG_EXACT)
- if(NOT REVISION)
-+  get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-+  string(SUBSTRING "${GIT_SHA1}" 0 8 GIT_SHA1_SHORT)
-+  git_describe(GIT_DESCRIPTION)
-+  git_describe(GIT_TAG_LAST "--abbrev=0")
-+  git_get_exact_tag(GIT_TAG_EXACT)
-   string(SUBSTRING "${GIT_TAG_LAST}-${GIT_SHA1_SHORT}" 1 -1 REVISION)
-   if(GIT_TAG_EXACT)
-     string(SUBSTRING "${GIT_TAG_EXACT}" 1 -1 REVISION)
-@@ -15,9 +15,11 @@
-     set(GIT_TAG_EXACT "")
-   endif()
-   message(STATUS "Git HEAD is ${GIT_SHA1}")
-+  # rpm/deb packaging uses this, only works on whole tag numbers
-+  string(SUBSTRING "${GIT_TAG_LAST}" 1 -1 REVISION_LAST)
-+else()
-+  set(REVISION_LAST "${REVISION}")
- endif()
- 
- # strip leading 'v', and make unique for the tag
- message(STATUS "Revision is ${REVISION}")
--# rpm/deb packaging uses this, only works on whole tag numbers
--string(SUBSTRING "${GIT_TAG_LAST}" 1 -1 REVISION_LAST)
diff --git a/src_python_CMakeLists-txt.patch b/src_python_CMakeLists-txt.patch
deleted file mode 100644
index 6631d9fc1085..000000000000
--- a/src_python_CMakeLists-txt.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/python/CMakeLists.txt.orig	2015-10-12 11:59:13.000000000 -0500
-+++ src/python/CMakeLists.txt	2015-11-08 15:55:25.279577336 -0600
-@@ -7,11 +7,15 @@
- 
- symlink_file(${CMAKE_CURRENT_SOURCE_DIR}/bcc ${CMAKE_CURRENT_BINARY_DIR}/bcc)
- 
-+if(NOT PYTHON_CMD)
-+  set(PYTHON_CMD "python")
-+endif()
-+
- set(PIP_INSTALLABLE "${CMAKE_CURRENT_BINARY_DIR}/dist/bcc-${REVISION}.tar.gz")
- configure_file(setup.py.in ${CMAKE_CURRENT_BINARY_DIR}/setup.py @ONLY)
- # build the pip installable
- add_custom_command(OUTPUT ${PIP_INSTALLABLE}
--  COMMAND python setup.py sdist
-+  COMMAND ${PYTHON_CMD} setup.py sdist
-   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bcc/__init__.py ${CMAKE_CURRENT_BINARY_DIR}/setup.py
-   )
-@@ -20,6 +24,6 @@
- if(EXISTS "/etc/debian_version")
-   set(PYTHON_FLAGS "${PYTHON_FLAGS} --install-layout deb")
- endif()
--install(CODE "execute_process(COMMAND python setup.py install -f ${PYTHON_FLAGS}
-+install(CODE "execute_process(COMMAND ${PYTHON_CMD} setup.py install -f ${PYTHON_FLAGS}
-   --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})"
-   COMPONENT python)