diff --git a/k3s.spec b/k3s.spec index 21712af..5d969c4 100644 --- a/k3s.spec +++ b/k3s.spec @@ -3,21 +3,21 @@ Name: k3s Version: 1.24.2+rc1+k3s2 -Release: 2 +Release: 3 Summary: Installer for k3s optimised for openSUSE MicroOS License: Apache-2.0 Group: System/Management URL: https://k3s.io Source0: https://github.com/k3s-io/k3s/archive/v%{version}.tar.gz#/v%{version}.tar.gz -Source5: build.tar.gz -Source6: build-tar-create.sh +Source1: build.tar.gz +Source2: build-tar-create.sh BuildRequires: golang BuildRequires: libseccomp-devel BuildRequires: btrfs-progs-devel -BuildRequires: containernetworking-plugins +BuildRequires: k3s-plugins BuildRequires: k3s-containerd -BuildRequires: docker-runc +BuildRequires: docker-runc BuildRequires: systemd systemd-devel Requires: container-selinux Requires: k3s-selinux @@ -52,10 +52,9 @@ distribution that differs from the original Kubernetes (colloquially %prep %autosetup -p1 -n k3s-%(echo %{version} | tr '+' '-') -cp %{SOURCE5} . +cp %{SOURCE1} . sed -i '/echo Building runc/,+5d' scripts/build -cp /usr/libexec/cni/cni bin/ -cp /usr/local/bin/runc bin/ +cp /usr/share/k3s/cni bin/ %build export GOPATH=%{_builddir}/go @@ -69,8 +68,12 @@ pushd build mkdir -p ./src/github.com/containerd/containerd cp -rf /usr/libexec/containerd/containerd-1.6.6/. src/github.com/containerd/containerd/ popd + mkdir etc ./scripts/build + +cp /usr/bin/runc bin/ + SKIP_AIRGAP=true SKIP_IMAGE=true ./scripts/package %install @@ -90,6 +93,9 @@ cp install.sh %{buildroot}%{_sbindir}/k3s-install.sh %{_sbindir}/k3s-install.sh %changelog +* Feb Nov 01 2022 Ge Wang - 1.24.2+rc1+k3s2-3 +- add flannel plugin to project to fix sandbox creating failure + * Wed Aug 31 2022 Yuncheng Zhu - 1.24.2+rc1+k3s2-2 - add missed requires