Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2017-11-03 16:32:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containerd" Fri Nov 3 16:32:13 2017 rev:19 rq:536962 version:0.2.8+gitr671_3addd8406531 Changes: -------- --- /work/SRC/openSUSE:Factory/containerd/containerd.changes 2017-10-20 14:39:35.009888959 +0200 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2017-11-03 16:33:14.961868534 +0100 @@ -1,0 +2,15 @@ +Thu Oct 26 19:27:48 UTC 2017 - [email protected] + +- Set --start-timeout=2m by default to match upstream. bsc#1064926 + +------------------------------------------------------------------- +Thu Oct 26 17:31:18 UTC 2017 - [email protected] + +- Use the upstream makefile so that Docker can get the commit ID in `docker + info`. This also will avoid possible future warnings being spit out like + bsc#1065109 and boo#1053532. +- Backport https://github.com/containerd/containerd/pull/1686, which is + required for the above fix. bsc#1065109 boo#1053532 + + bsc1065109-0001-makefile-add-support-for-build_flags.patch + +------------------------------------------------------------------- New: ---- bsc1065109-0001-makefile-add-support-for-build_flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerd.spec ++++++ --- /var/tmp/diff_new_pack.Krw7wP/_old 2017-11-03 16:33:15.785838543 +0100 +++ /var/tmp/diff_new_pack.Krw7wP/_new 2017-11-03 16:33:15.785838543 +0100 @@ -14,32 +14,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# nodebuginfo %define go_tool go %define GO_BUILD_FLAGS -buildmode=pie # MANUAL: Update the git_version and git_revision -%define git_version 3addd8406531 +%define git_version 3addd840653146c90a254301d6c3a663c7fd6429 +%define git_short 3addd8406531 # How to get the git_revision # git clone https://github.com/containerd/containerd.git containerd-upstream # cd containerd # git checkout $git_version # git_revision=r$(git rev-list HEAD | wc -l) %define git_revision r671 -%define version_unconverted %{git_version} Name: containerd -Version: 0.2.8+git%{git_revision}_%{git_version} +Version: 0.2.8+git%{git_revision}_%{git_short} Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0 Group: System/Management Url: https://containerd.tools -Source: %{name}-git.%{git_version}.tar.xz +Source: %{name}-git.%{git_short}.tar.xz Source1: %{name}.service Source2: %{name}.socket Source3: sysconfig.%{name} +# OPENSUSE-FIX-UPSTREAM: Backport of https://github.com/containerd/containerd/pull/1686. bsc#1065109 boo#1053532 +Patch100: bsc1065109-0001-makefile-add-support-for-build_flags.patch +BuildRequires: fdupes BuildRequires: golang(API) = 1.8 BuildRoot: %{_tmppath}/%{name}-%{version}-build # Currently runC is the only supported runtime for containerd. NOTE: @@ -50,10 +54,6 @@ Requires: docker-runc = 1.0.0rc3+gitr3201_2d41c04 Requires(post): %fillup_prereq -%define client ctr -%define daemon %{name} -%define shim %{name}-shim - %description Containerd is a daemon with an API and a command line client, to manage containers on one machine. It uses runC to run containers according to the OCI @@ -81,7 +81,9 @@ Test package for containerd. It contains the source code and the tests. %prep -%setup -q -n %{name}-git.%{git_version} +%setup -q -n %{name}-git.%{git_short} +# bsc#1065109 boo#1053532 +%patch100 -p1 %build # Do not use symlinks. If you want to run the unit tests for this package at @@ -92,14 +94,10 @@ rm -rf $HOME/go/src/github.com/containerd/containerd/* cp -ar * $HOME/go/src/github.com/containerd/containerd -# Build daemon. -%go_tool build %GO_BUILD_FLAGS -x -o %{daemon}-%{version} github.com/containerd/%{name}/%{daemon} - -# Build shim. -%go_tool build %GO_BUILD_FLAGS -x -o %{shim}-%{version} github.com/containerd/%{name}/%{shim} - -# Build client. -%go_tool build %GO_BUILD_FLAGS -x -o %{client}-%{version} github.com/containerd/%{name}/%{client} +make GIT_COMMIT=%{git_version} +cp bin/ctr ctr-%{version} +cp bin/containerd containerd-%{version} +cp bin/containerd-shim containerd-shim-%{version} %check export GOPATH=$HOME/go/src/github.com/containerd/containerd/vendor:$GOPATH @@ -107,9 +105,9 @@ %go_tool test %GO_BUILD_FLAGS -v $(%go_tool list ./... | grep github.com/containerd/containerd | grep -v /integration-test) %install -install -D -m755 %{daemon}-%{version} %{buildroot}/%{_sbindir}/%{daemon} -install -D -m755 %{shim}-%{version} %{buildroot}/%{_sbindir}/%{shim} -install -D -m755 %{client}-%{version} %{buildroot}/%{_sbindir}/%{name}-%{client} +install -D -m755 containerd-%{version} %{buildroot}/%{_sbindir}/containerd +install -D -m755 containerd-shim-%{version} %{buildroot}/%{_sbindir}/containerd-shim +install -D -m755 ctr-%{version} %{buildroot}/%{_sbindir}/%{name}-ctr # Add service and sysconfig. install -D -m644 %SOURCE1 %{buildroot}/%{_unitdir}/%{name}.service @@ -120,6 +118,8 @@ install -d -m755 %{buildroot}/usr/src/containerd/ cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/containerd/ +%fdupes %{buildroot} + %pre %service_add_pre %{name}.service %{name}.socket @@ -136,15 +136,15 @@ %files %defattr(-,root,root) %doc LICENSE.code LICENSE.docs README.md -%{_sbindir}/%{daemon} -%{_sbindir}/%{shim} +%{_sbindir}/containerd +%{_sbindir}/containerd-shim %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket /var/adm/fillup-templates/sysconfig.%{name} %{_sbindir}/rccontainerd %files ctr -%{_sbindir}/%{name}-%{client} +%{_sbindir}/%{name}-ctr %files test %defattr(-,root,root) ++++++ bsc1065109-0001-makefile-add-support-for-build_flags.patch ++++++ >From e805baf7240fbd2ba7eb12dd64a251cd7d272b7e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Fri, 27 Oct 2017 04:21:24 +1100 Subject: [PATCH] makefile: add support for build_flags This is quite necessary in order for us to be able to build RPMs using the upstream Makefile. -buildmode=pie in particular is quite an important flag to use by default. SUSE-Bugfix: http://bugzilla.suse.com/show_bug.cgi?id=1065109 SUSE-Bugfix: https://bugzilla.opensuse.org/show_bug.cgi?id=1053532 SUSE-Backport: https://github.com/containerd/containerd/pull/1686 Signed-off-by: Aleksa Sarai <[email protected]> --- Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c822bf762c8c..23f21a1ce402 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,8 @@ PROJECT=github.com/containerd/containerd GIT_COMMIT := $(shell git rev-parse HEAD 2> /dev/null || true) GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null) +DYN_BUILD_FLAGS := -buildmode=pie +STATIC_BUILD_FLAGS := LDFLAGS := -X github.com/containerd/containerd.GitCommit=${GIT_COMMIT} ${LDFLAGS} TEST_TIMEOUT ?= 5m @@ -42,22 +44,22 @@ clean: rm -rf bin && rm -rf output client: bin - cd ctr && go build -ldflags "${LDFLAGS}" -o ../bin/ctr + cd ctr && go build $(DYN_BUILD_FLAGS) -ldflags "${LDFLAGS}" -o ../bin/ctr client-static: - cd ctr && go build -ldflags "-w -extldflags -static ${LDFLAGS}" -tags "$(BUILDTAGS)" -o ../bin/ctr + cd ctr && go build $(STATIC_BUILD_FLAGS) -ldflags "-w -extldflags -static ${LDFLAGS}" -tags "$(BUILDTAGS)" -o ../bin/ctr daemon: bin - cd containerd && go build -ldflags "${LDFLAGS}" -tags "$(BUILDTAGS)" -o ../bin/containerd + cd containerd && go build $(DYN_BUILD_FLAGS) -ldflags "${LDFLAGS}" -tags "$(BUILDTAGS)" -o ../bin/containerd daemon-static: - cd containerd && go build -ldflags "-w -extldflags -static ${LDFLAGS}" -tags "$(BUILDTAGS)" -o ../bin/containerd + cd containerd && go build $(STATIC_BUILD_FLAGS) -ldflags "-w -extldflags -static ${LDFLAGS}" -tags "$(BUILDTAGS)" -o ../bin/containerd shim: bin - cd containerd-shim && go build -tags "$(BUILDTAGS)" -ldflags "-w ${LDFLAGS}" -o ../bin/containerd-shim + cd containerd-shim && go build $(DYN_BUILD_FLAGS) -tags "$(BUILDTAGS)" -ldflags "-w ${LDFLAGS}" -o ../bin/containerd-shim shim-static: - cd containerd-shim && go build -ldflags "-w -extldflags -static ${LDFLAGS}" -tags "$(BUILDTAGS)" -o ../bin/containerd-shim + cd containerd-shim && go build $(STATIC_BUILD_FLAGS) -ldflags "-w -extldflags -static ${LDFLAGS}" -tags "$(BUILDTAGS)" -o ../bin/containerd-shim $(TESTBENCH_BUNDLE_DIR)/busybox.tar: mkdir -p $(TESTBENCH_BUNDLE_DIR) -- 2.14.2 ++++++ containerd.service ++++++ --- /var/tmp/diff_new_pack.Krw7wP/_old 2017-11-03 16:33:15.849836213 +0100 +++ /var/tmp/diff_new_pack.Krw7wP/_new 2017-11-03 16:33:15.849836213 +0100 @@ -6,7 +6,7 @@ [Service] EnvironmentFile=/etc/sysconfig/containerd -ExecStart=/usr/sbin/containerd --listen fd:// $CONTAINERD_OPTS +ExecStart=/usr/sbin/containerd --listen fd:// --start-timeout=2m $CONTAINERD_OPTS LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity
