diff --git a/apply-patch b/apply-patch index 3a9f525b14a0df1e11583583db87bcd72e988e41..812d4f14df078724fe86a743df415dbb74bf6e3b 100755 --- a/apply-patch +++ b/apply-patch @@ -7,14 +7,11 @@ set -ex -pkg=containerd-1.2.0 +pkg=containerd-1.6.9 cwd=$PWD src=$cwd/$pkg -unzip v1.2.0.zip -if [[ ! -d patch ]]; then - tar zxf patch.tar.gz -fi +unzip v1.6.9.zip cd $src git init @@ -24,16 +21,6 @@ git config user.email 'build@obs.com' git commit -m 'init build' cd $cwd -series=$cwd/series.conf -while IPF= read -r line -do - if [[ "$line" =~ ^patch* ]]; then - echo git apply $cwd/$line - cd $src && git apply $cwd/$line - fi -done <"$series" - -cd $cwd cp -rf $src/* . mv $src/.git $src/git -rm -rf containerd-1.2.0 +rm -rf containerd-1.6.9 diff --git a/containerd.spec b/containerd.spec index 487ac7b1eecf8d821fb7fbc20f76907eb5ec6f76..a991af718fba382382a24d86c99e0a011991a54f 100644 --- a/containerd.spec +++ b/containerd.spec @@ -1,17 +1,13 @@ %global goipath github.com/containerd/containerd %global debug_package %{nil} -Version: 1.2.0 +Version: 1.6.9 Name: containerd -Release: 308 +Release: 1 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io -Source0: https://github.com/containerd/containerd/archive/v1.2.0.zip -Source1: patch.tar.gz -Source2: apply-patch -Source3: series.conf -Source4: git-commit -Source5: gen-commit.sh +Source0: https://github.com/containerd/containerd/archive/v1.6.9.zip +Source1: apply-patch BuildRequires: golang glibc-static make btrfs-progs-devel git @@ -25,9 +21,6 @@ low-level storage and network attachments, etc. %prep cp %{SOURCE0} . cp %{SOURCE1} . -cp %{SOURCE2} . -cp %{SOURCE3} . -cp %{SOURCE4} . %build echo %{VERSION}.%{RELEASE} > containerd_version @@ -55,6 +48,12 @@ install -p -m 755 bin/ctr $RPM_BUILD_ROOT/%{_bindir}/ctr %{_bindir}/ctr %changelog +* Thu Feb 23 2023 xingweizheng - 1.6.9-1 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:update to 1.6.9 + * Thu Dec 16 2022 zhongjiawei - 1.2.0-308 - Type:bugfix - ID:NA diff --git a/v1.2.0.zip b/v1.6.9.zip similarity index 38% rename from v1.2.0.zip rename to v1.6.9.zip index 724bf394bd7162f785ba610c34d47eaaacd32813..7d0d72e3ce64c44e9915d05228c3744b3cd2deb2 100644 Binary files a/v1.2.0.zip and b/v1.6.9.zip differ