summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja[at]gmail[dot]com>2015-10-03 07:10:10 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-10-03 07:10:10 +0700
commita60d4f3cf74da36fde1301a11bf5d6f836ce662b (patch)
treef7f71fb2d4538b6a4895f859bfcabd2b621ddf11
parent57b15df9325e59e3c734f97380407048fa055cd3 (diff)
downloadslackbuilds-a60d4f3cf74da36fde1301a11bf5d6f836ce662b.tar.gz
system/sysdig: Updated for version 0.2.0.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/sysdig/README7
-rw-r--r--system/sysdig/sysdig.SlackBuild18
-rw-r--r--system/sysdig/sysdig.info6
3 files changed, 21 insertions, 10 deletions
diff --git a/system/sysdig/README b/system/sysdig/README
index f03eee3067..45c9e6bc6a 100644
--- a/system/sysdig/README
+++ b/system/sysdig/README
@@ -9,4 +9,9 @@ To build the package for a kernel different from the running one, start the
script setting the KERNEL variable as in
KERNEL=2.6.38.8 ./sysdig.SlackBuild
-Optional: luajit
+To build sysdig with dkms support supply the variable DKMS="yes" to
+sysdig.SlackBuild. This also needs dkms installed as a runtime dependency.
+
+ # DKMS="yes" ./sysdig.SlackBuild
+
+Optional: luajit and dkms
diff --git a/system/sysdig/sysdig.SlackBuild b/system/sysdig/sysdig.SlackBuild
index f25f7c8bd2..19dc328c99 100644
--- a/system/sysdig/sysdig.SlackBuild
+++ b/system/sysdig/sysdig.SlackBuild
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=sysdig
-VERSION=${VERSION:-0.1.104}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.2.0}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -74,6 +74,14 @@ find -L . \
# Fix manpage location
sed -i 's|share/||' userspace/sysdig/man/CMakeLists.txt
+# Determine if dkms is to be used. Default is no.
+if [ "${DKMS:-no}" == "yes" ]; then
+ USEDKMS="ON"
+else
+ USEDKMS="OFF"
+ sed -i '/sysdig-probe-loader/,$d' scripts/CMakeLists.txt
+fi
+
mkdir build
cd build
cmake -G "Unix Makefiles" \
@@ -84,6 +92,7 @@ cd build
-DUSE_BUNDLED_NCURSES:BOOL=OFF \
-DUSE_BUNDLED_JSONCPP:BOOL=OFF \
-DUSE_BUNDLED_LUAJIT:BOOL=OFF \
+ -DENABLE_DKMS:BOOL="$USEDKMS" \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_BUILD_TYPE=Release ..
@@ -103,12 +112,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a *.md COPYING $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Remove dkms related files.
-rm -rf $PKG/usr/src $PKG/usr/bin/sysdig-probe-loader
-
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-sed "s|@KERNEL@|$KERNEL|" $CWD/doinst.sh > $PKG/install/doinst.sh
+sed -e "s|@KERNEL@|$KERNEL|" $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/sysdig/sysdig.info b/system/sysdig/sysdig.info
index aa2ca2d58e..0bdb1a12fc 100644
--- a/system/sysdig/sysdig.info
+++ b/system/sysdig/sysdig.info
@@ -1,8 +1,8 @@
PRGNAM="sysdig"
-VERSION="0.1.104"
+VERSION="0.2.0"
HOMEPAGE="http://www.sysdig.org"
-DOWNLOAD="https://github.com/draios/sysdig/archive/0.1.104.tar.gz"
-MD5SUM="86bc42dd850c347b75e50c7b37ed9b21"
+DOWNLOAD="https://github.com/draios/sysdig/archive/0.2.0.tar.gz"
+MD5SUM="d7116f0e547ddda298a082a710182482"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="jsoncpp lua"