83 lines
2.8 KiB
Diff
83 lines
2.8 KiB
Diff
|
From 8f97c7a7353c05a8b64ef9ee522ee62fba66a608 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhangyu235 <zhangyu235@huawei.com>
|
||
|
|
Date: Sun, 5 May 2019 19:50:56 +0800
|
||
|
|
Subject: [PATCH] containerd: fix the path of containerd.spec in
|
||
|
|
Makefile
|
||
|
|
|
||
|
|
Change-Id: I4ec87e5ddf256574513f977e53e4bdf050e0169c
|
||
|
|
Signed-off-by: zhangyu235 <zhangyu235@huawei.com>
|
||
|
|
---
|
||
|
|
Makefile | 2 +-
|
||
|
|
hack/containerd.spec | 46 ----------------------------------------------
|
||
|
|
2 files changed, 1 insertion(+), 47 deletions(-)
|
||
|
|
delete mode 100644 hack/containerd.spec
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index a400899..5de5cf7 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -20,7 +20,7 @@ ROOTDIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
|
||
|
|
DESTDIR=/usr/local
|
||
|
|
|
||
|
|
# Used to populate variables in version package.
|
||
|
|
-VERSION=$(shell echo version:)$(shell grep '^Version' ${ROOTDIR}/hack/containerd.spec | sed 's/[^0-9.]*\([0-9.]*\).*/\1/').$(shell grep '^Release:' ${ROOTDIR}/hack/containerd.spec | sed 's/[^0-9.]*\([0-9.]*\).*/\1/')
|
||
|
|
+VERSION=$(shell echo version:)$(shell grep '^Version' ${ROOTDIR}/containerd.spec | sed 's/[^0-9.]*\([0-9.]*\).*/\1/').$(shell grep '^Release:' ${ROOTDIR}/containerd.spec | sed 's/[^0-9.]*\([0-9.]*\).*/\1/')
|
||
|
|
REVISION=$(shell echo commit:)$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
|
||
|
|
|
||
|
|
ifneq "$(strip $(shell command -v go 2>/dev/null))" ""
|
||
|
|
diff --git a/hack/containerd.spec b/hack/containerd.spec
|
||
|
|
deleted file mode 100644
|
||
|
|
index 05f68c7..0000000
|
||
|
|
--- a/hack/containerd.spec
|
||
|
|
+++ /dev/null
|
||
|
|
@@ -1,46 +0,0 @@
|
||
|
|
-%global goipath github.com/containerd/containerd
|
||
|
|
-%global debug_package %{nil}
|
||
|
|
-Version: 1.2.0
|
||
|
|
-
|
||
|
|
-Name: containerd
|
||
|
|
-Release: 7%{?dist}
|
||
|
|
-Summary: An industry-standard container runtime
|
||
|
|
-License: ASL 2.0
|
||
|
|
-URL: https://containerd.io
|
||
|
|
-Source0: containerd-1.2.0.tar.gz
|
||
|
|
-
|
||
|
|
-BuildRequires: golang glibc-static make
|
||
|
|
-BuildRequires: btrfs-progs-devel
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-%description
|
||
|
|
-containerd is an industry-standard container runtime with an emphasis on
|
||
|
|
-simplicity, robustness and portability. It is available as a daemon for Linux
|
||
|
|
-and Windows, which can manage the complete container lifecycle of its host
|
||
|
|
-system: image transfer and storage, container execution and supervision,
|
||
|
|
-low-level storage and network attachments, etc.
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-%prep
|
||
|
|
-%setup -c -n containerd
|
||
|
|
-
|
||
|
|
-%build
|
||
|
|
-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 GOPATH=$GO_BUILD_PATH:%{gopath}
|
||
|
|
-export BUILDTAGS="no_btrfs no_cri"
|
||
|
|
-make
|
||
|
|
-
|
||
|
|
-%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
|
||
|
|
-
|
||
|
|
-%files
|
||
|
|
-%{_bindir}/containerd
|
||
|
|
-%{_bindir}/containerd-shim
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-%changelog
|
||
|
|
--
|
||
|
|
2.7.4.3
|
||
|
|
|