jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

containerd: updated to v1.2.6

Browse Source
This commit is contained in:
5schatten 2019-04-13 10:06:55 +02:00
parent 2d493d2669
commit 0753eb4ce6
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/addons/addon-depends/containerd/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="containerd" PKG_NAME="containerd"
PKG_VERSION="1.2.2" PKG_VERSION="1.2.6"
PKG_SHA256="91d480816986d74ff4fa7dd0412c787615fa705975b18fa4079c333b137c653f" PKG_SHA256="f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891"
PKG_LICENSE="APL" PKG_LICENSE="APL"
PKG_SITE="https://containerd.tools/" PKG_SITE="https://containerd.tools/"
PKG_URL="https://github.com/containerd/containerd/archive/v$PKG_VERSION.tar.gz" PKG_URL="https://github.com/containerd/containerd/archive/v$PKG_VERSION.tar.gz"
@ -13,14 +13,14 @@ PKG_LONGDESC="A daemon to control runC, built for performance and density."
PKG_TOOLCHAIN="manual" PKG_TOOLCHAIN="manual"
pre_make_target() { pre_make_target() {
case $TARGET_ARCH in case ${TARGET_ARCH} in
x86_64) x86_64)
export GOARCH=amd64 export GOARCH=amd64
;; ;;
arm) arm)
export GOARCH=arm export GOARCH=arm
case $TARGET_CPU in case ${TARGET_CPU} in
arm1176jzf-s) arm1176jzf-s)
export GOARM=6 export GOARM=6
;; ;;
@ -37,26 +37,26 @@ pre_make_target() {
export GOOS=linux export GOOS=linux
export CGO_ENABLED=1 export CGO_ENABLED=1
export CGO_NO_EMULATION=1 export CGO_NO_EMULATION=1
export CGO_CFLAGS=$CFLAGS export CGO_CFLAGS=${CFLAGS}
export CONTAINERD_VERSION=v${PKG_VERSION} export CONTAINERD_VERSION=v${PKG_VERSION}
export CONTAINERD_REVISION=${PKG_VERSION} export CONTAINERD_REVISION=${PKG_VERSION}
export CONTAINERD_PKG=github.com/containerd/containerd export CONTAINERD_PKG=github.com/containerd/containerd
export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC" export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC"
export GOLANG=$TOOLCHAIN/lib/golang/bin/go export GOLANG=${TOOLCHAIN}/lib/golang/bin/go
export GOPATH=$PKG_BUILD/.gopath export GOPATH=${PKG_BUILD}/.gopath
export GOROOT=$TOOLCHAIN/lib/golang export GOROOT=${TOOLCHAIN}/lib/golang
export PATH=$PATH:$GOROOT/bin export PATH=${PATH}:${GOROOT}/bin
mkdir -p $PKG_BUILD/.gopath mkdir -p ${PKG_BUILD}/.gopath
if [ -d $PKG_BUILD/vendor ]; then if [ -d ${PKG_BUILD}/vendor ]; then
mv $PKG_BUILD/vendor $PKG_BUILD/.gopath/src mv ${PKG_BUILD}/vendor ${PKG_BUILD}/.gopath/src
fi fi
ln -fs $PKG_BUILD $PKG_BUILD/.gopath/src/github.com/containerd/containerd ln -fs ${PKG_BUILD} ${PKG_BUILD}/.gopath/src/github.com/containerd/containerd
} }
make_target() { make_target() {
mkdir -p bin mkdir -p bin
$GOLANG build -v -o bin/containerd -a -tags "static_build no_btrfs" -ldflags "$LDFLAGS" ./cmd/containerd ${GOLANG} build -v -o bin/containerd -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd
$GOLANG build -v -o bin/containerd-shim -a -tags "static_build no_btrfs" -ldflags "$LDFLAGS" ./cmd/containerd-shim ${GOLANG} build -v -o bin/containerd-shim -a -tags "static_build no_btrfs" -ldflags "${LDFLAGS}" ./cmd/containerd-shim
} }