@@ -132,7 +132,7 @@ if \

 	command -v gcc &> /dev/null \

 	&& ! ( echo -e  '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null -ldevmapper &> /dev/null ) \

 ; then

-       DOCKER_BUILDTAGS+=' libdm_no_deferred_remove'

+    DOCKER_BUILDTAGS+=' libdm_no_deferred_remove'

 fi

 # Use these flags when compiling the tests and final binary

@@ -183,79 +183,12 @@ if [ "$(uname -s)" = 'FreeBSD' ]; then

 	LDFLAGS="$LDFLAGS -extld clang"

 fi

-HAVE_GO_TEST_COVER=

-if \

-	go help testflag | grep -- -cover > /dev/null \

-	&& go tool -n cover > /dev/null 2>&1 \

-; then

-	HAVE_GO_TEST_COVER=1

-fi

-

-# a helper to provide ".exe" when it's appropriate

-binary_extension() {

-	if [ "$(go env GOOS)" = 'windows' ]; then

-		echo -n '.exe'

-	fi

-}

-

-hash_files() {

-	while [ $# -gt 0 ]; do

-		f="$1"

-		shift

-		dir="$(dirname "$f")"

-		base="$(basename "$f")"

-		for hashAlgo in md5 sha256; do

-			if command -v "${hashAlgo}sum" &> /dev/null; then

-				(

-					# subshell and cd so that we get output files like:

-					#   $HASH docker-$VERSION

-					# instead of:

-					#   $HASH /go/src/github.com/.../$VERSION/binary/docker-$VERSION

-					cd "$dir"

-					"${hashAlgo}sum" "$base" > "$base.$hashAlgo"

-				)

-			fi

-		done

-	done

-}

-

 bundle() {

 	local bundle="$1"; shift

 	echo "---> Making bundle: $(basename "$bundle") (in $DEST)"

 	source "$SCRIPTDIR/make/$bundle" "$@"

 }

-copy_binaries() {

-	dir="$1"

-	# Add nested executables to bundle dir so we have complete set of

-	# them available, but only if the native OS/ARCH is the same as the

-	# OS/ARCH of the build target

-	if [ "$(go env GOOS)/$(go env GOARCH)" == "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then

-		if [ -x /usr/local/bin/docker-runc ]; then

-			echo "Copying nested executables into $dir"

-			for file in containerd containerd-shim containerd-ctr runc init proxy; do

-				cp -f `which "docker-$file"` "$dir/"

-				if [ "$2" == "hash" ]; then

-					hash_files "$dir/docker-$file"

-				fi

-			done

-		fi

-	fi

-}

-

-install_binary() {

-	file="$1"

-	target="${DOCKER_MAKE_INSTALL_PREFIX:=/usr/local}/bin/"

-	if [ "$(go env GOOS)" == "linux" ]; then

-		echo "Installing $(basename $file) to ${target}"

-		mkdir -p "$target"

-		cp -f -L "$file" "$target"

-	else

-		echo "Install is only supported on linux"

-		return 1

-	fi

-}

-

 main() {

 	# We want this to fail if the bundles already exist and cannot be removed.

 	# This is to avoid mixing bundles from different versions of the code.

@@ -1,6 +1,13 @@

 #!/usr/bin/env bash

 set -e

+# a helper to provide ".exe" when it's appropriate

+binary_extension() {

+	if [ "$(go env GOOS)" = 'windows' ]; then

+		echo -n '.exe'

+	fi

+}

+

 GO_PACKAGE='github.com/docker/docker/cmd/dockerd'

 BINARY_SHORT_NAME='dockerd'

 BINARY_NAME="$BINARY_SHORT_NAME-$VERSION"

@@ -9,6 +16,27 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"

 source "${MAKEDIR}/.go-autogen"

+hash_files() {

+	while [ $# -gt 0 ]; do

+		f="$1"

+		shift

+		dir="$(dirname "$f")"

+		base="$(basename "$f")"

+		for hashAlgo in md5 sha256; do

+			if command -v "${hashAlgo}sum" &> /dev/null; then

+				(

+					# subshell and cd so that we get output files like:

+					#   $HASH docker-$VERSION

+					# instead of:

+					#   $HASH /go/src/github.com/.../$VERSION/binary/docker-$VERSION

+					cd "$dir"

+					"${hashAlgo}sum" "$base" > "$base.$hashAlgo"

+				)

+			fi

+		done

+	done

+}

+

 (

 export GOGC=${DOCKER_BUILD_GOGC:-1000}

@@ -1,9 +1,27 @@

 #!/usr/bin/env bash

 set -e

-[ -z "$KEEPDEST" ] && rm -rf "$DEST"

+copy_binaries() {

+	local dir="$1"

+	local hash="$2"

+	# Add nested executables to bundle dir so we have complete set of

+	# them available, but only if the native OS/ARCH is the same as the

+	# OS/ARCH of the build target

+	if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then

+		return

+	fi

+	if [ ! -x /usr/local/bin/docker-runc ]; then

+		return

+	fi

+	echo "Copying nested executables into $dir"

+	for file in containerd containerd-shim containerd-ctr runc init proxy; do

+		cp -f `which "docker-$file"` "$dir/"

+		if [ "$hash" == "hash" ]; then

+			hash_files "$dir/docker-$file"

+		fi

+	done

+}

-(

-	source "${MAKEDIR}/.binary"

-	copy_binaries "$DEST" 'hash'

-)

+[ -z "$KEEPDEST" ] && rm -rf "$DEST"

+source "${MAKEDIR}/.binary"

+copy_binaries "$DEST" 'hash'

@@ -3,6 +3,19 @@

 set -e

 rm -rf "$DEST"

+install_binary() {

+	local file="$1"

+	local target="${DOCKER_MAKE_INSTALL_PREFIX:=/usr/local}/bin/"

+	if [ "$(go env GOOS)" == "linux" ]; then

+		echo "Installing $(basename $file) to ${target}"

+		mkdir -p "$target"

+		cp -f -L "$file" "$target"

+	else

+		echo "Install is only supported on linux"

+		return 1

+	fi

+}

+

 (

 	DEST="$(dirname $DEST)/binary-daemon"

 	source "${MAKEDIR}/.binary-setup"