From 13adecbc3e136fcb1894f0604db04468dd01a4b3 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Fri, 1 Dec 2017 13:55:43 +0000
Subject: [PATCH] linuxkit: move version info to subpackage

Will avoid circular includes when I reference from pkglib too.

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 Makefile                            |  4 ++--
 src/cmd/linuxkit/main.go            | 16 ++++++----------
 src/cmd/linuxkit/version/version.go |  9 +++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 src/cmd/linuxkit/version/version.go

diff --git a/Makefile b/Makefile
index 54d5026e3..c6a7e4d4a 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ bin/linuxkit: tmp_linuxkit_bin.tar
 	touch $@
 
 tmp_linuxkit_bin.tar: $(LINUXKIT_DEPS)
-	tar cf - -C src/cmd/linuxkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/linuxkit/linuxkit/src/cmd/linuxkit --ldflags "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)" -o bin/linuxkit > $@
+	tar cf - -C src/cmd/linuxkit . | docker run --rm --net=none --log-driver=none -i $(CROSS) $(GO_COMPILE) --package github.com/linuxkit/linuxkit/src/cmd/linuxkit --ldflags "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.GitCommit=$(GIT_COMMIT) -X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=$(VERSION)" -o bin/linuxkit > $@
 
 .PHONY: test-cross
 test-cross:
@@ -67,7 +67,7 @@ LOCAL_BUILDMODE?=pie
 endif
 LOCAL_BUILDMODE?=default
 
-LOCAL_LDFLAGS += -s -w -extldflags \"-static\" -X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)
+LOCAL_LDFLAGS += -s -w -extldflags \"-static\" -X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.GitCommit=$(GIT_COMMIT) -X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=$(VERSION)
 LOCAL_TARGET ?= bin/linuxkit
 
 .PHONY: local-check local-build local-test local
diff --git a/src/cmd/linuxkit/main.go b/src/cmd/linuxkit/main.go
index 89bdb91c2..fda3ea09d 100644
--- a/src/cmd/linuxkit/main.go
+++ b/src/cmd/linuxkit/main.go
@@ -7,6 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/linuxkit/linuxkit/src/cmd/linuxkit/version"
+
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 )
@@ -27,12 +29,6 @@ type PkgConfig struct {
 var (
 	defaultLogFormatter = &log.TextFormatter{}
 
-	// Version is the human-readable version
-	Version = "unknown"
-
-	// GitCommit hash, set at compile time
-	GitCommit = "unknown"
-
 	// Config is the global tool configuration
 	Config = GlobalConfig{}
 )
@@ -49,9 +45,9 @@ func (f *infoFormatter) Format(entry *log.Entry) ([]byte, error) {
 	return defaultLogFormatter.Format(entry)
 }
 
-func version() {
-	fmt.Printf("%s version %s\n", filepath.Base(os.Args[0]), Version)
-	fmt.Printf("commit: %s\n", GitCommit)
+func printVersion() {
+	fmt.Printf("%s version %s\n", filepath.Base(os.Args[0]), version.Version)
+	fmt.Printf("commit: %s\n", version.GitCommit)
 	os.Exit(0)
 }
 
@@ -129,7 +125,7 @@ func main() {
 	case "run":
 		run(args[1:])
 	case "version":
-		version()
+		printVersion()
 	case "help":
 		flag.Usage()
 	default:
diff --git a/src/cmd/linuxkit/version/version.go b/src/cmd/linuxkit/version/version.go
new file mode 100644
index 000000000..0ade3e2b9
--- /dev/null
+++ b/src/cmd/linuxkit/version/version.go
@@ -0,0 +1,9 @@
+package version
+
+var (
+	// Version is the human-readable version
+	Version = "unknown"
+
+	// GitCommit hash, set at compile time
+	GitCommit = "unknown"
+)