426e62f1ed
- Update changelogs to mention bsc#1113313. - 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 OBS-URL: https://build.opensuse.org/request/show/646374 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=81
33 lines
762 B
Diff
33 lines
762 B
Diff
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
|
|
|