conmon: 0.0.1pre52_6905a4d -> 0.2.0

Update conmon to v0.2.0 and move it into a dedicated package. Since we
are now using conmon as dedicated package, cri-o does not need to built
it, too.

Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
Sascha Grunert
2019-06-11 10:44:22 -07:00
committed by Austin Seipp
parent 11d1932f11
commit 3577443b37
4 changed files with 37 additions and 39 deletions
@@ -41,15 +41,10 @@ buildGoPackage rec {
buildPhase = ''
pushd go/src/${goPackagePath}
# Build conmon and pause
# Build pause
go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \
-ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config
pushd conmon
../bin/crio-config
popd
make -C conmon
make -C pause
# Build the crio binary
@@ -60,7 +55,6 @@ buildGoPackage rec {
install -Dm755 bin/crio $bin/bin/crio${flavor}
mkdir -p $bin/libexec/crio
install -Dm755 bin/conmon $bin/libexec/crio/conmon${flavor}
install -Dm755 bin/pause $bin/libexec/crio/pause${flavor}
'';