From f5c4b8b591e605b951e66d71dfad1898fafc2eb8 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Tue, 29 Mar 2016 13:46:39 -0700
Subject: [PATCH] app-emulation/docker: Set libdm_no_deferred_remove

Apply docker buildtag fixup from docker-1.7.1 (Commit
cd1fc3e4b2db741ed165420b1a4fb072b7690a51)  with a
condition on the lvm2 version, and add arm64 keyword.

Fixes docker-1.10.3 builds for arm64.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 .../app-emulation/docker/docker-9999.ebuild              | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
index 66df9756e8..17a3e2411e 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	CROS_WORKON_COMMIT="8acee1bc06813191ba5ea396137e1c17a7120bdf" # v1.10.3 + overlay fixes
 	DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 arm64"
 fi
 
 inherit bash-completion-r1 eutils linux-info multilib systemd udev user cros-workon
@@ -229,6 +229,13 @@ src_compile() {
 		DOCKER_BUILDTAGS+=' apparmor'
 	fi
 
+	if has_version '<sys-fs/lvm2-2.02.110' ; then
+		# Docker uses the host files when testing features, so force
+		# docker to not use dm_task_deferred_remove to cover cross
+		# builds.
+		DOCKER_BUILDTAGS+=' libdm_no_deferred_remove'
+	fi
+
 	# https://github.com/docker/docker/pull/13338
 	if use experimental; then
 		export DOCKER_EXPERIMENTAL=1