From d89a7baaa09466fff28edfaa5253f02fe892119a Mon Sep 17 00:00:00 2001
From: "Fengfei.Xi" <xi.fengfei@h3c.com>
Date: Thu, 25 Aug 2022 20:29:25 +0800
Subject: [PATCH] containerd: add other compilation result files to the rpm
 package

  1. files: containerd-shim-runc-v1, containerd-stress, ctr, containerd.service
  2. add require(coreutils) and scripts required by containerd.service

Signed-off-by: Fengfei.Xi <xi.fengfei@h3c.com>
---
 containerd.spec | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/containerd.spec b/containerd.spec
index d617fb1..cbba408 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 Version:        1.2.0
 Name:           containerd
-Release:        303
+Release:        304
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -14,6 +14,7 @@ Source4:        git-commit
 Source5:        gen-commit.sh
 
 BuildRequires:  golang glibc-static make btrfs-progs-devel
+Requires:       coreutils
 
 %description
 containerd is an industry-standard container runtime with an emphasis on
@@ -41,17 +42,42 @@ export GOPATH=$GO_BUILD_PATH:%{gopath}
 export BUILDTAGS="no_btrfs no_cri"
 make
 strip ./bin/containerd ./bin/containerd-shim
+strip ./bin/containerd-shim-runc-v1 ./bin/containerd-stress ./bin/ctr
 
 %install
 install -d $RPM_BUILD_ROOT/%{_bindir}
 install -p -m 755 bin/containerd $RPM_BUILD_ROOT/%{_bindir}/containerd
 install -p -m 755 bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim
+install -p -m 755 bin/containerd-shim-runc-v1 $RPM_BUILD_ROOT/%{_bindir}/containerd-shim-runc-v1
+install -p -m 755 bin/containerd-stress $RPM_BUILD_ROOT/%{_bindir}/containerd-stress
+install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr
+install -d $RPM_BUILD_ROOT/%{_unitdir}
+install -p -m 755 containerd.service $RPM_BUILD_ROOT/%{_unitdir}/containerd.service
 
 %files
 %{_bindir}/containerd
 %{_bindir}/containerd-shim
+%{_bindir}/containerd-shim-runc-v1
+%{_bindir}/containerd-stress
+%{_bindir}/ctr
+%{_unitdir}/containerd.service
+
+%post
+mkdir -p /usr/local/bin
+ln -snf %{_bindir}/containerd /usr/local/bin/containerd
+
+%postun
+rm -f /usr/local/bin/containerd
 
 %changelog
+* Thu Aug 25 2022 xi.fengfei<xi.fengfei@h3c.com> - 1.2.0-304
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC: add other compilation result files to the rpm package
+       1. files: containerd-shim-runc-v1, containerd-stress, ctr, containerd.service
+       2. add require(coreutils) and scripts required by containerd.service 
+
 * Mon Jul 4 2022 zhongjiawei<zhongjiawei1@huawei.com> - 1.2.0-303
 - Type:bugfix
 - ID:NA
-- 
Gitee