From 40c5052cfb68ea9ec1c05b7d03f4f4029301b05a Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Fri, 22 Sep 2017 14:28:37 -0700
Subject: [PATCH] dev-db/etcd: Fix etcd2 on arm64

If we build a program, we probably expect to be able to run it.
---
 .../etcd/{etcd-2.3.8.ebuild => etcd-2.3.8-r1.ebuild}   |  0
 .../coreos-overlay/dev-db/etcd/etcd-9999.ebuild        |  5 +++++
 .../etcd/files/etcd-2.3.8-fix-pointless-breakage.patch | 10 ++++++++++
 3 files changed, 15 insertions(+)
 rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-2.3.8.ebuild => etcd-2.3.8-r1.ebuild} (100%)
 create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-2.3.8-fix-pointless-breakage.patch

diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.8.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.8-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.8.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-2.3.8-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
index 23dfb77f15..84d51b8b4e 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-9999.ebuild
@@ -27,6 +27,11 @@ IUSE="+etcdctl"
 RDEPEND="!dev-db/etcd:0
 	etcdctl? ( !dev-db/etcdctl )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.3.8-fix-pointless-breakage.patch"
+	coreos-go_src_prepare "$@"
+}
+
 src_compile() {
 	GO_LDFLAGS="-X ${COREOS_GO_PACKAGE}/version.GitSHA=${CROS_WORKON_COMMIT:0:7}"
 	go_build "${COREOS_GO_PACKAGE}"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-2.3.8-fix-pointless-breakage.patch b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-2.3.8-fix-pointless-breakage.patch
new file mode 100644
index 0000000000..c96e5e560c
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-2.3.8-fix-pointless-breakage.patch
@@ -0,0 +1,10 @@
+--- etcdmain/etcd.go
++++ etcdmain/etcd.go
+@@ -555,6 +555,7 @@
+ }
+ 
+ func checkSupportArch() {
++	return
+ 	// TODO qualify arm64
+ 	if runtime.GOARCH == "amd64" {
+ 		return