Merge pull request #5 from xs-nanjing/CA-172846

CA-172846: Tools installed out of date when a Linux VM is freshly installed from templates

Author: Zhengchai

mk/Makefile.deb

@@ -96,10 +96,10 @@ $(SOURCEDIR)/%: $(REPO)/mk/%
 $(SOURCEDIR)/citrix.list: citrix.list
 	$(call brand,$<) > $@
 
-$(SOURCEDIR)/xe-daemon: $(XE_DAEMON_GO_SOURCES:%=$(REPO)/%) $(GOROOT)
+$(SOURCEDIR)/xe-daemon: $(XE_DAEMON_GO_SOURCES:%=$(GOBUILDDIR)/%) $(GOROOT)
 	$(GOBIN) build $(GOFLAGS) -o $@ $<
 
-$(SOURCEDIR)/xenstore: $(XENSTORE_GO_SOURCES:%=$(REPO)/%) $(GOROOT)
+$(SOURCEDIR)/xenstore: $(XENSTORE_GO_SOURCES:%=$(GOBUILDDIR)/%) $(GOROOT)
 	$(GOBIN) build $(GOFLAGS) -o $@ $<
 
 $(SOURCEDIR)/LICENSE: $(REPO)/LICENSE

mk/Makefile.rpm

@@ -97,10 +97,10 @@ $(RPM_SOURCESDIR)/%: $(REPO)/mk/%
 	mkdir -p $(RPM_SOURCESDIR)
 	$(call brand,$<) > $@
 
-$(RPM_SOURCESDIR)/xe-daemon: $(XE_DAEMON_GO_SOURCES:%=$(REPO)/%) $(GOROOT)
+$(RPM_SOURCESDIR)/xe-daemon: $(XE_DAEMON_GO_SOURCES:%=$(GOBUILDDIR)/%) $(GOROOT)
 	$(GOBIN) build $(GOFLAGS) -o $@ $<
 
-$(RPM_SOURCESDIR)/xenstore: $(XENSTORE_GO_SOURCES:%=$(REPO)/%) $(GOROOT)
+$(RPM_SOURCESDIR)/xenstore: $(XENSTORE_GO_SOURCES:%=$(GOBUILDDIR)/%) $(GOROOT)
 	$(GOBIN) build $(GOFLAGS) -o $@ $<
 
 $(RPM_SOURCESDIR)/LICENSE: $(REPO)/LICENSE

mk/Makefile.tgz

@@ -79,10 +79,10 @@ $(SOURCEDIR)/%: $(REPO)/mk/%
 $(SOURCEDIR)/citrix.list: citrix.list
 	$(call brand,$<) > $@
 
-$(SOURCEDIR)/xe-daemon: $(XE_DAEMON_GO_SOURCES:%=$(REPO)/%) $(GOROOT)
+$(SOURCEDIR)/xe-daemon: $(XE_DAEMON_GO_SOURCES:%=$(GOBUILDDIR)/%) $(GOROOT)
 	$(GOBIN) build $(GOFLAGS) -o $@ $<
 
-$(SOURCEDIR)/xenstore: $(XENSTORE_GO_SOURCES:%=$(REPO)/%) $(GOROOT)
+$(SOURCEDIR)/xenstore: $(XENSTORE_GO_SOURCES:%=$(GOBUILDDIR)/%) $(GOROOT)
 	$(GOBIN) build $(GOFLAGS) -o $@ $<
 
 $(GOBUILDDIR)/%: $(GO_SOURCE_REPO)/%