Merge branch 'w/2.9/bugfix/update-containerd-go-source-co-url' into t…

…mp/octopus/w/2.10/bugfix/update-containerd-go-source-co-url
scality · Nov 26, 2021 · d30d6b5 · d30d6b5
2 parents 1da32d4 + 18b4a84
commit d30d6b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/buildchain/buildchain/packaging.py b/buildchain/buildchain/packaging.py
@@ -355,7 +355,7 @@ def _rpm_package_containerd(releasever: str) -> targets.RPMPackage:
             Path("0001-Revert-commit-for-Windows-metrics.patch"),
             Path("containerd.service"),
             Path("containerd.toml"),
-            Path("containerd-{}.tar.gz".format(versions.CONTAINERD_VERSION)),
+            Path("v{}.tar.gz".format(versions.CONTAINERD_VERSION)),
         ]
         + extra_sources,
     )

diff --git a/packages/redhat/common/containerd.spec b/packages/redhat/common/containerd.spec
@@ -10,7 +10,7 @@ Version:        1.4.3
 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips}}
 %global debug_package %{nil}
 %global gourl https://%{goipath}
-%global gosource %{gourl}/archive/v%{version}/%{name}-%{version}.tar.gz
+%global gosource %{gourl}/archive/refs/tags/v%{version}.tar.gz
 %define gobuildroot %{expand:
 GO_BUILD_PATH=$PWD/_build
 install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})