summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAudrius Kažukauskas <audrius@neutrino.lt>2018-03-31 17:26:19 +0300
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-04-01 08:33:45 +0700
commite29465a113833f31994680275bcd81fdb79b4360 (patch)
treedc75998c801e1fafcdd746dc39ba715a55050c5f
parent4da1e79bdb657ede4034b8419966b84ed39e5f11 (diff)
downloadslackbuilds-e29465a113833f31994680275bcd81fdb79b4360.tar.gz
system/containerd: Updated for version 1.0.2.
Signed-off-by: Audrius Kažukauskas <audrius@neutrino.lt>
-rw-r--r--system/containerd/containerd.SlackBuild23
-rw-r--r--system/containerd/containerd.info6
2 files changed, 18 insertions, 11 deletions
diff --git a/system/containerd/containerd.SlackBuild b/system/containerd/containerd.SlackBuild
index ef002278d4..82e2254fbd 100644
--- a/system/containerd/containerd.SlackBuild
+++ b/system/containerd/containerd.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for containerd
# Copyright 2016 Asaf Ohayon <asaf@sysbind.co.il>
-# Copyright 2017 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=containerd
-VERSION=${VERSION:-0.2.9_06b9cb3}
-GITHASH=${GITHASH:-06b9cb35161009dcb7123345749fef02f7cea8e0}
+VERSION=${VERSION:-1.0.2}
+GITHASH=${GITHASH:-cfd04396dc68220d1cecbe686a6cc3aa5ce3667c}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -47,9 +47,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$GITHASH
-tar xvf $CWD/$PRGNAM-$GITHASH.tar.gz
-cd $PRGNAM-$GITHASH
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -57,18 +57,25 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+sed -i \
+ -e "s/git describe --match.*$/echo ${VERSION})/" \
+ -e "s/git rev-parse HEAD.*$/echo ${GITHASH})/" \
+ -e 's/-s -w //' \
+ Makefile
+
mkdir build
mv vendor build/src
-ln -sf $TMP/$PRGNAM-$GITHASH build/src/github.com/containerd/containerd
+ln -sf $TMP/$PRGNAM-$VERSION build/src/github.com/containerd/containerd
make \
BUILDTAGS="seccomp" \
GIT_COMMIT=$GITHASH \
- GOPATH=$TMP/$PRGNAM-$GITHASH/build
+ GOPATH=$TMP/$PRGNAM-$VERSION/build
# Install executables.
install -D -m 0755 bin/containerd $PKG/usr/bin/containerd
install -D -m 0755 bin/containerd-shim $PKG/usr/bin/containerd-shim
+install -D -m 0755 bin/containerd-stress $PKG/usr/bin/containerd-stress
install -D -m 0755 bin/ctr $PKG/usr/bin/ctr
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/containerd/containerd.info b/system/containerd/containerd.info
index a234dd3327..4579714b3c 100644
--- a/system/containerd/containerd.info
+++ b/system/containerd/containerd.info
@@ -1,10 +1,10 @@
PRGNAM="containerd"
-VERSION="0.2.9_06b9cb3"
+VERSION="1.0.2"
HOMEPAGE="https://containerd.io/"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/06b9cb3/containerd-06b9cb35161009dcb7123345749fef02f7cea8e0.tar.gz"
-MD5SUM_x86_64="202389709618a6b181216e99718f0132"
+DOWNLOAD_x86_64="https://github.com/containerd/containerd/archive/v1.0.2/containerd-1.0.2.tar.gz"
+MD5SUM_x86_64="cecab97d572371db0778d69a57553b92"
REQUIRES="runc"
MAINTAINER="Audrius Kažukauskas"
EMAIL="audrius@neutrino.lt"