aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/runc/runc.SlackBuild18
-rw-r--r--system/runc/runc.info6
2 files changed, 11 insertions, 13 deletions
diff --git a/system/runc/runc.SlackBuild b/system/runc/runc.SlackBuild
index 0fd24df67ae34..fd6b65999dccc 100644
--- a/system/runc/runc.SlackBuild
+++ b/system/runc/runc.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for runc
# Copyright 2016 Asaf Ohayon <asaf@sysbind.co.il>
-# Copyright 2017-2018 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2017-2019 Audrius Kažukauskas <audrius@neutrino.lt>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,11 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=runc
-VERSION=${VERSION:-1.0.0_rc6}
-GITHASH=${GITHASH:-ccb5efd37fb7c86364786e9137e22948751de7ed}
+VERSION=${VERSION:-1.0.0_rc6_6635b4f}
+GITHASH=${GITHASH:-6635b4f0c6af3810594d2770f662f34ddc15b40d}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-SRCVER=$(echo $VERSION | tr _ -)
-
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i586 ;;
@@ -49,9 +47,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$GITHASH
+tar xvf $CWD/$PRGNAM-$GITHASH.tar.gz
+cd $PRGNAM-$GITHASH
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -61,14 +59,14 @@ find -L . \
mkdir build
mv vendor build/src
-ln -sf $TMP/$PRGNAM-$SRCVER build/src/github.com/opencontainers/runc
+ln -sf $TMP/$PRGNAM-$GITHASH build/src/github.com/opencontainers/runc
# Do not try to get git commit hash, we're not inside git repository.
sed -i '/^COMMIT/d' Makefile
make \
COMMIT=$GITHASH \
- GOPATH=$TMP/$PRGNAM-$SRCVER/build
+ GOPATH=$TMP/$PRGNAM-$GITHASH/build
make install BINDIR=$PKG/usr/bin
make install-bash PREFIX=$PKG/usr
diff --git a/system/runc/runc.info b/system/runc/runc.info
index 7d76abd26f541..2aee48b1acf61 100644
--- a/system/runc/runc.info
+++ b/system/runc/runc.info
@@ -1,10 +1,10 @@
PRGNAM="runc"
-VERSION="1.0.0_rc6"
+VERSION="1.0.0_rc6_6635b4f"
HOMEPAGE="https://github.com/opencontainers/runc"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/v1.0.0-rc6/runc-1.0.0-rc6.tar.gz"
-MD5SUM_x86_64="7ebd2593d8faace9a96241c973b27002"
+DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/6635b4f/runc-6635b4f0c6af3810594d2770f662f34ddc15b40d.tar.gz"
+MD5SUM_x86_64="af1d3202e57809bf8629f093d7acace6"
REQUIRES="google-go-lang libseccomp"
MAINTAINER="Audrius Kažukauskas"
EMAIL="audrius@neutrino.lt"