Accepting request 646394 from Virtualization:containers

OBS-URL: https://build.opensuse.org/request/show/646394
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/containerd?expand=0&rev=27

0001-makefile-remove-emoji.patch

@@ -0,0 +1,32 @@
+From 285c7ac5d5027d45bbcdc49334243f2a3ba6dd05 Mon Sep 17 00:00:00 2001
+From: Aleksa Sarai <asarai@suse.de>
+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 <asarai@suse.de>
+---
+ 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
+

containerd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Nov  5 10:28:13 UTC 2018 - Aleksa Sarai <asarai@suse.com>
+
+- 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
+
 -------------------------------------------------------------------
 Wed Aug 22 10:10:09 UTC 2018 - asarai@suse.com
 

containerd.spec

@@ -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 @@ Source:         %{realname}-git.%{git_short}.tar.xz
 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 @@ Test package for containerd. It contains the source code and the tests.
 %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