diff --git a/etcd.spec b/etcd.spec index cb0d41e..f4cd9ce 100644 --- a/etcd.spec +++ b/etcd.spec @@ -36,7 +36,7 @@ Name: %{repo} Version: 3.0.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 URL: https://%{provider_prefix} @@ -44,6 +44,7 @@ Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar Source1: %{name}.service Source2: %{name}.conf Patch2: 0001-change-import-paths.patch +Patch3: run-etcd-on-ppc64le-by-default.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x @@ -287,6 +288,7 @@ mkdir -p Godeps/_workspace/src mv cmd/vendor/* Godeps/_workspace/src/. %patch2 -p1 +%patch3 -p1 %build mkdir -p src/github.com/coreos @@ -427,6 +429,10 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog +* Fri Nov 18 2016 jchaloup - 3.0.15-2 +- Remove ppc64le architecture restriction + resolves: #1396463 + * Tue Nov 15 2016 jchaloup - 3.0.15-1 - Update to v3.0.15 related: #1382965 diff --git a/run-etcd-on-ppc64le-by-default.patch b/run-etcd-on-ppc64le-by-default.patch new file mode 100644 index 0000000..e053777 --- /dev/null +++ b/run-etcd-on-ppc64le-by-default.patch @@ -0,0 +1,31 @@ +From 5f8e74959f19f19018ab0e6400e0f5daba3567e5 Mon Sep 17 00:00:00 2001 +From: Jan Chaloupka +Date: Sat, 26 Nov 2016 13:46:29 +0100 +Subject: [PATCH] run etcd on ppc64le by default + +--- + etcdmain/etcd.go | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go +index 950513e..7225303 100644 +--- a/etcdmain/etcd.go ++++ b/etcdmain/etcd.go +@@ -636,6 +636,14 @@ func checkSupportArch() { + if runtime.GOARCH == "amd64" { + return + } ++ ++ if runtime.GOARCH == "ppc64le" { ++ plog.Warningf("Running etcd on ppc64le architecture is not supported.") ++ plog.Warningf("Be aware you are running the etcd at your own risk.") ++ plog.Warningf("For more information visit https://bugzilla.redhat.com/show_bug.cgi?id=1396463") ++ return ++ } ++ + if env, ok := os.LookupEnv("ETCD_UNSUPPORTED_ARCH"); ok && env == runtime.GOARCH { + plog.Warningf("running etcd on unsupported architecture %q since ETCD_UNSUPPORTED_ARCH is set", env) + return +-- +1.9.3 +