diff --git a/packages/Cargo.lock b/packages/Cargo.lock index 00088a25c55..b0f7203da21 100644 --- a/packages/Cargo.lock +++ b/packages/Cargo.lock @@ -85,14 +85,6 @@ dependencies = [ "libxcrypt 0.1.0", ] -[[package]] -name = "cri-tools" -version = "0.1.0" -dependencies = [ - "glibc 0.1.0", - "libseccomp 0.1.0", -] - [[package]] name = "dbus-broker" version = "0.1.0" diff --git a/packages/Cargo.toml b/packages/Cargo.toml index b8520c8184f..2777ae4ff80 100644 --- a/packages/Cargo.toml +++ b/packages/Cargo.toml @@ -10,7 +10,6 @@ members = [ "conntrack-tools", "containerd", "coreutils", - "cri-tools", "dbus-broker", "docker-cli", "docker-engine", diff --git a/packages/cri-tools/Cargo.toml b/packages/cri-tools/Cargo.toml deleted file mode 100644 index 6177e1aff11..00000000000 --- a/packages/cri-tools/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "cri-tools" -version = "0.1.0" -edition = "2018" -publish = false -build = "build.rs" - -[lib] -path = "pkg.rs" - -[[package.metadata.build-package.external-files]] -url = "https://github.com/kubernetes-sigs/cri-tools/archive/v1.14.0/cri-tools-1.14.0.tar.gz" -sha512 = "c8978e4380ebb2dd59ce533ade94486ae1e4091fda7acd8cf5cce662034a1d34a1851c43bf766a723c5ba71c15972733a2e80c6e82fb1c27e5a1dfc2e85476bf" - -[build-dependencies] -glibc = { path = "../glibc" } -libseccomp = { path = "../libseccomp" } diff --git a/packages/cri-tools/build.rs b/packages/cri-tools/build.rs deleted file mode 100644 index cad8999af53..00000000000 --- a/packages/cri-tools/build.rs +++ /dev/null @@ -1,9 +0,0 @@ -use std::process::{exit, Command}; - -fn main() -> Result<(), std::io::Error> { - let ret = Command::new("buildsys").arg("build-package").status()?; - if !ret.success() { - exit(1); - } - Ok(()) -} diff --git a/packages/cri-tools/cri-tools.spec b/packages/cri-tools/cri-tools.spec deleted file mode 100644 index bd06986fc1a..00000000000 --- a/packages/cri-tools/cri-tools.spec +++ /dev/null @@ -1,44 +0,0 @@ -%global goproject github.com/kubernetes-sigs -%global gorepo cri-tools -%global goimport %{goproject}/%{gorepo} - -%global gover 1.14.0 -%global rpmver %{gover} - -%global _dwz_low_mem_die_limit 0 - -Name: %{_cross_os}%{gorepo} -Version: %{rpmver} -Release: 1%{?dist} -Summary: CLI and validation tools for Container Runtime Interface -License: ASL 2.0 -URL: https://%{goimport} -Source0: https://%{goimport}/archive/v%{gover}/%{gorepo}-%{gover}.tar.gz -BuildRequires: git -BuildRequires: %{_cross_os}glibc-devel -BuildRequires: %{_cross_os}libseccomp-devel -Requires: %{_cross_os}libseccomp - -%description -%{summary}. - -%prep -%autosetup -Sgit -n %{gorepo}-%{gover} -p1 -%cross_go_setup %{gorepo}-%{gover} %{goproject} %{goimport} - -%build -%cross_go_configure %{goimport} -export BUILDTAGS="rpm_crashtraceback seccomp selinux" -go build -buildmode pie -tags="${BUILDTAGS}" -o crictl %{goimport}/cmd/crictl -go test -c -buildmode pie -tags="${BUILDTAGS}" -o critest %{goimport}/cmd/critest - -%install -install -d %{buildroot}%{_cross_bindir} -install -p -m 0755 crictl %{buildroot}%{_cross_bindir} -install -p -m 0755 critest %{buildroot}%{_cross_bindir} - -%files -%{_cross_bindir}/crictl -%{_cross_bindir}/critest - -%changelog diff --git a/packages/cri-tools/pkg.rs b/packages/cri-tools/pkg.rs deleted file mode 100644 index d799fb2d44c..00000000000 --- a/packages/cri-tools/pkg.rs +++ /dev/null @@ -1 +0,0 @@ -// not used