forked from mirrors/nixpkgs
cri-o: 1.15.2 -> 1.16.0
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
This commit is contained in:
parent
9a5ef400fc
commit
f46e8f9a12
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
buildGoPackage rec {
|
buildGoPackage rec {
|
||||||
project = "cri-o";
|
project = "cri-o";
|
||||||
version = "1.15.2";
|
version = "1.16.0";
|
||||||
name = "${project}-${version}${flavor}";
|
name = "${project}-${version}${flavor}";
|
||||||
|
|
||||||
goPackagePath = "github.com/${project}/${project}";
|
goPackagePath = "github.com/${project}/${project}";
|
||||||
|
@ -26,7 +26,7 @@ buildGoPackage rec {
|
||||||
owner = "cri-o";
|
owner = "cri-o";
|
||||||
repo = "cri-o";
|
repo = "cri-o";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0fiizxwxdq87h943421ivgw49jndk23yjz3saf1rzmn7g3xh2pn4";
|
sha256 = "1kbg544v7c1apaxrpndgrap0pb5c67d8fazbkgykg6ynskx6n344";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "out" ];
|
outputs = [ "bin" "out" ];
|
||||||
|
@ -42,17 +42,23 @@ buildGoPackage rec {
|
||||||
pushd go/src/${goPackagePath}
|
pushd go/src/${goPackagePath}
|
||||||
|
|
||||||
# Build pause
|
# Build pause
|
||||||
go build -tags ${makeFlags} -o bin/crio-config -buildmode=pie \
|
|
||||||
-ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio-config
|
|
||||||
|
|
||||||
make -C pause
|
make -C pause
|
||||||
|
|
||||||
# Build the crio binary
|
# Build the crio binaries
|
||||||
go build -tags ${makeFlags} -o bin/crio -buildmode=pie \
|
function build() {
|
||||||
-ldflags '-s -w ${ldflags}' ${goPackagePath}/cmd/crio
|
go build \
|
||||||
|
-tags ${makeFlags} \
|
||||||
|
-o bin/"$1" \
|
||||||
|
-buildmode=pie \
|
||||||
|
-ldflags '-s -w ${ldflags}' \
|
||||||
|
${goPackagePath}/cmd/"$1"
|
||||||
|
}
|
||||||
|
build crio
|
||||||
|
build crio-status
|
||||||
'';
|
'';
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -Dm755 bin/crio $bin/bin/crio${flavor}
|
install -Dm755 bin/crio $bin/bin/crio${flavor}
|
||||||
|
install -Dm755 bin/crio-status $bin/bin/crio-status${flavor}
|
||||||
|
|
||||||
mkdir -p $bin/libexec/crio
|
mkdir -p $bin/libexec/crio
|
||||||
install -Dm755 bin/pause $bin/libexec/crio/pause${flavor}
|
install -Dm755 bin/pause $bin/libexec/crio/pause${flavor}
|
||||||
|
|
Loading…
Reference in a new issue