From 17e0a15386c2a2ff01417d66e37683bd9a2a79c8 Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <jess@docker.com>
Date: Tue, 28 Oct 2014 16:25:50 -0700
Subject: [PATCH 1/3] Revert "Use code generation to set IAMSTATIC instead of
 -X"

This reverts commit 3e10b93106dea94e5747ab32fe4ac765aa22f9bc.

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

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
---
 .gitignore          |  3 ---
 hack/make.sh        | 12 +-----------
 hack/make/binary    | 11 -----------
 hack/make/dynbinary | 20 +-------------------
 4 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21df574df6..2a86e41caf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,3 @@ docs/AWS_S3_BUCKET
 docs/GIT_BRANCH
 docs/VERSION
 docs/GITCOMMIT
-dockerversion/static.go
-dockerversion/details.go
-dockerversion/init.go
diff --git a/hack/make.sh b/hack/make.sh
index a841c13424..f97633de57 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -94,17 +94,6 @@ if [ -z "$DOCKER_CLIENTONLY" ]; then
 	DOCKER_BUILDTAGS+=" daemon"
 fi
 
-rm -f dockerversion/static.go dockerversion/details.go dockerversion/init.go
-cat > dockerversion/details.go <<EOF
-// AUTOGENERATED FILE; see hack/make.sh
-package dockerversion
-
-func init() {
-	GITCOMMIT = "$GITCOMMIT"
-	VERSION = "$VERSION"
-}
-EOF
-
 # Use these flags when compiling the tests and final binary
 LDFLAGS='-w'
 LDFLAGS_STATIC='-linkmode external'
@@ -122,6 +111,7 @@ TESTFLAGS+=" -test.timeout=${TIMEOUT}"
 EXTLDFLAGS_STATIC_DOCKER="$EXTLDFLAGS_STATIC -lpthread -Wl,--unresolved-symbols=ignore-in-object-files"
 LDFLAGS_STATIC_DOCKER="
 	$LDFLAGS_STATIC
+	-X $DOCKER_PKG/dockerversion.IAMSTATIC true
 	-extldflags \"$EXTLDFLAGS_STATIC_DOCKER\"
 "
 
diff --git a/hack/make/binary b/hack/make/binary
index 2c71f201b9..b97069a856 100755
--- a/hack/make/binary
+++ b/hack/make/binary
@@ -3,17 +3,6 @@ set -e
 
 DEST=$1
 
-: ${IAMSTATIC:=true}
-
-cat > dockerversion/static.go <<EOF
-// AUTOGENERATED FILE; see hack/make/binary and hack/make/dynbinary
-package dockerversion
-
-func init() {
-	IAMSTATIC = $IAMSTATIC
-}
-EOF
-
 go build \
 	-o "$DEST/docker-$VERSION" \
 	"${BUILDFLAGS[@]}" \
diff --git a/hack/make/dynbinary b/hack/make/dynbinary
index 171dd16ba3..5064a799bd 100644
--- a/hack/make/dynbinary
+++ b/hack/make/dynbinary
@@ -5,14 +5,6 @@ DEST=$1
 
 if [ -z "$DOCKER_CLIENTONLY" ]; then
 	# dockerinit still needs to be a static binary, even if docker is dynamic
-	cat > dockerversion/static.go <<EOF
-// AUTOGENERATED FILE; see hack/make/binary and hack/make/dynbinary
-package dockerversion
-
-func init() {
-	IAMSTATIC = true
-}
-EOF
 	go build \
 		-o "$DEST/dockerinit-$VERSION" \
 		"${BUILDFLAGS[@]}" \
@@ -47,17 +39,7 @@ fi
 # exported so that "dyntest" can easily access it later without recalculating it
 
 (
-	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"
-	INITPATH = "$DOCKER_INITPATH"
-}
-EOF
-	export IAMSTATIC=false
+	export LDFLAGS_STATIC_DOCKER="-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" -X $DOCKER_PKG/dockerversion.INITPATH \"$DOCKER_INITPATH\""
 	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
 	source "$(dirname "$BASH_SOURCE")/binary"
 )

From ec1420cc2b228116d4aa9c812bd98fa8acdc1b98 Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <jess@docker.com>
Date: Tue, 28 Oct 2014 16:27:23 -0700
Subject: [PATCH 2/3] Revert "use code generation for GITCOMMIT/VERSION too"

This reverts commit 85744a35de0e30c2dd6741b833f38ff218c8a3fc.

Conflicts:
	.gitignore
	hack/make.sh

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
---
 hack/make.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hack/make.sh b/hack/make.sh
index f97633de57..d6da3057fa 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -95,7 +95,11 @@ if [ -z "$DOCKER_CLIENTONLY" ]; then
 fi
 
 # Use these flags when compiling the tests and final binary
-LDFLAGS='-w'
+LDFLAGS='
+	-w
+	-X '$DOCKER_PKG'/dockerversion.GITCOMMIT "'$GITCOMMIT'"
+	-X '$DOCKER_PKG'/dockerversion.VERSION "'$VERSION'"
+'
 LDFLAGS_STATIC='-linkmode external'
 EXTLDFLAGS_STATIC='-static'
 # ORIG_BUILDFLAGS is necessary for the cross target which cannot always build

From 7041eb00be7d6224aeedf7db317667b1d121b54d Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <jess@docker.com>
Date: Tue, 28 Oct 2014 16:29:01 -0700
Subject: [PATCH 3/3] 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 | 12 +++---------
 hack/make/dyntest-unit        | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/hack/make/dyntest-integration b/hack/make/dyntest-integration
index 5015c10969..1cc7349aba 100644
--- a/hack/make/dyntest-integration
+++ b/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"
 )
diff --git a/hack/make/dyntest-unit b/hack/make/dyntest-unit
index 32cd8136bc..cffef98512 100644
--- a/hack/make/dyntest-unit
+++ b/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"
 )