diff options
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | cmake.patch | 12 |
3 files changed, 13 insertions, 17 deletions
@@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Sun Dec 27 08:43:32 UTC 2015 pkgbase = heka pkgdesc = Data collection and processing made easy - pkgver = 0.10.0b0 + pkgver = 0.10.0b2 pkgrel = 1 url = https://github.com/mozilla-services/heka arch = i686 @@ -14,9 +16,10 @@ pkgbase = heka makedepends = mercurial makedepends = patch depends = geoip + optdepends = geoip-citydata: GeoIpDecoder provides = heka conflicts = heka - source = heka::git+https://github.com/mozilla-services/heka.git#tag=v0.10.0b0 + source = heka::git+https://github.com/mozilla-services/heka.git#tag=v0.10.0b2 source = cmake.patch sha512sums = SKIP sha512sums = SKIP @@ -1,7 +1,7 @@ pkgname=('heka') srcname='heka' pkgdesc='Data collection and processing made easy' -pkgver='0.10.0b0' +pkgver='0.10.0b2' pkgrel='1' arch=('i686' 'x86_64') url="https://github.com/mozilla-services/${srcname}" @@ -17,6 +17,7 @@ makedepends=( 'mercurial' 'patch' ) +optdepends=('geoip-citydata: GeoIpDecoder') provides=("${pkgname[0]%-git}") conflicts=("${pkgname[0]%-git}") @@ -48,10 +49,11 @@ build() { mkdir --parents "${BUILD_DIR}" cd "${BUILD_DIR}" cmake \ - -DCMAKE_BUILD_TYPE='release' \ -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_BUILD_TYPE='release' \ + -DHEKA_PATH='/usr/share/heka' \ .. - make -j 1 + make } package() { @@ -64,4 +66,7 @@ package() { cd "${BUILD_DIR}" make DESTDIR="${pkgdir}" install + + install -D --directory "${pkgdir}/var/cache/hekad" + install -D --directory "${pkgdir}/etc/heka/conf.d" } diff --git a/cmake.patch b/cmake.patch index f16f80e51c31..efb74661513e 100644 --- a/cmake.patch +++ b/cmake.patch @@ -10,15 +10,3 @@ index dfabba7..c1a0ffc 100644 set(PROJECT_PATH "${CMAKE_BINARY_DIR}/heka") set(HEKA_PATH "${PROJECT_PATH}/src/github.com/mozilla-services/heka") set(LUA_INCLUDE_PATH "${PROJECT_PATH}/include") -@@ -285,9 +284,9 @@ endif() - if (INCLUDE_MOZSVC) - add_test(mozsvc ${GO_EXECUTABLE} test ${BENCHMARK_FLAG} ${COVERAGE_FLAG} github.com/mozilla-services/heka-mozsvc-plugins) - endif() --install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION bin) -+install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples") - if(INCLUDE_SANDBOX) --install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION bin) -+install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples") - endif() - install(FILES "${CMAKE_SOURCE_DIR}/LICENSE.txt" DESTINATION "share/${CMAKE_PROJECT_NAME}") - install(DIRECTORY "${CMAKE_SOURCE_DIR}/dasher" DESTINATION "share/${CMAKE_PROJECT_NAME}") |