Revert "finally, use code generation for INITSHA1 & INITPATH too"

This reverts commit c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

hack/make/dyntest-integration

@@ -11,14 +11,8 @@ fi
 
 (
 	export TEST_DOCKERINIT_PATH="$INIT"
-	export LDFLAGS_STATIC_DOCKER=""
-	cat > dockerversion/init.go <<EOF
-// AUTOGENERATED FILE; see hack/make/dynbinary, hack/make/dyntest-integration and dyntest-unit
-package dockerversion
-
-func init() {
-	INITSHA1 = "$DOCKER_INITSHA1"
-}
-EOF
+	export LDFLAGS_STATIC_DOCKER="
+		-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\"
+	"
 	source "$(dirname "$BASH_SOURCE")/test-integration"
 )

hack/make/dyntest-unit

@@ -11,14 +11,8 @@ fi
 
 (
 	export TEST_DOCKERINIT_PATH="$INIT"
-	export LDFLAGS_STATIC_DOCKER=""
-	cat > dockerversion/init.go <<EOF
-// AUTOGENERATED FILE; see hack/make/dynbinary, hack/make/dyntest-integration and dyntest-unit
-package dockerversion
-
-func init() {
-	INITSHA1 = "$DOCKER_INITSHA1"
-}
-EOF
+	export LDFLAGS_STATIC_DOCKER="
+		-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\"
+	"
 	source "$(dirname "$BASH_SOURCE")/test-unit"
 )