From 21b8ac999c97d45f597f4502572de461fd647959 Mon Sep 17 00:00:00 2001 From: xiadanni Date: Mon, 10 Jan 2022 16:08:11 +0800 Subject: [PATCH] containerd:disable go module build as go1.17 enable it by default Signed-off-by: xiadanni --- containerd.spec | 9 ++++++++- git-commit | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/containerd.spec b/containerd.spec index 42b4f31..f9655b9 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.2.0 Name: containerd -Release: 108 +Release: 109 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -36,6 +36,7 @@ GO_BUILD_PATH=$PWD/_build install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath}) ln -fs $PWD $GO_BUILD_PATH/src/%{goipath} cd $GO_BUILD_PATH/src/%{goipath} +export GO111MODULE=off export GOPATH=$GO_BUILD_PATH:%{gopath} export BUILDTAGS="no_btrfs no_cri" make @@ -51,6 +52,12 @@ install -p -m 755 bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim %{_bindir}/containerd-shim %changelog +* Mon Jan 10 2022 xiadanni - 1.2.0-109 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:disable go module build + * Thu Mar 18 2021 xiadanni - 1.2.0-108 - Type:bugfix - ID:NA diff --git a/git-commit b/git-commit index f263050..436dfde 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -aec25f8e033c265f30268f7170d83095404adcef +bb2a17c091145aad503cc7637ea6641c2aaadcfc -- Gitee