Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2018-11-12 09:49:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containerd" Mon Nov 12 09:49:46 2018 rev:27 rq:646394 version:1.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/containerd/containerd.changes 2018-09-05 13:46:36.910062374 +0200 +++ /work/SRC/openSUSE:Factory/.containerd.new/containerd.changes 2018-11-12 09:49:48.424430130 +0100 @@ -1,0 +2,8 @@ +Mon Nov 5 10:28:13 UTC 2018 - Aleksa Sarai <[email protected]> + +- Add backport of https://github.com/containerd/containerd/pull/2764, which is + required for us to build containerd on i586 SLE-12 (where /bin/sh doesn't + like emoji in shell scripts). bsc#1102522 bsc#1113313 + + 0001-makefile-remove-emoji.patch + +------------------------------------------------------------------- New: ---- 0001-makefile-remove-emoji.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerd.spec ++++++ --- /var/tmp/diff_new_pack.v1d05G/_old 2018-11-12 09:49:49.176428999 +0100 +++ /var/tmp/diff_new_pack.v1d05G/_new 2018-11-12 09:49:49.176428999 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # nodebuginfo @@ -54,6 +54,8 @@ Source1: %{realname}-rpmlintrc # OPENSUSE-BACKPORT: Backport of https://github.com/containerd/containerd/pull/2534. Patch1: 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch +# OPENSUSE-FIX-UPSTREAM: Backport of https://github.com/containerd/containerd/pull/2764. +Patch2: 0001-makefile-remove-emoji.patch BuildRequires: fdupes BuildRequires: glibc-devel-static BuildRequires: go-go-md2man @@ -133,6 +135,7 @@ %prep %setup -q -n %{realname}-git.%{git_short} %patch1 -p1 +%patch2 -p1 %build # Do not use symlinks. If you want to run the unit tests for this package at ++++++ 0001-makefile-remove-emoji.patch ++++++ >From 285c7ac5d5027d45bbcdc49334243f2a3ba6dd05 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <[email protected]> Date: Mon, 5 Nov 2018 21:12:41 +1100 Subject: [PATCH] makefile: remove emoji These break the build on i386 in some very specific circumstances (where /bin/sh breaks when handling unicode), and are completely useless when it comes to actually building the project. Signed-off-by: Aleksa Sarai <[email protected]> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 35021fd3b491..2fcee039d1a1 100644 --- a/Makefile +++ b/Makefile @@ -50,8 +50,8 @@ else endif endif -WHALE = "🇩" -ONI = "👹" +WHALE = "[w]" +ONI = "[o]" RELEASE=containerd-$(VERSION:v%=%).${GOOS}-${GOARCH} -- 2.19.1
