summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhus Lu <phus.lu@citrix.com>2015-06-10 03:59:28 +0100
committerPhus Lu <phus.lu@citrix.com>2015-06-10 04:41:04 +0100
commitaf10e84666920b4fbcf425752792938e0f79cd63 (patch)
tree6307ba1514d1c9c72e1a93a358c486e37dda4393
parent42a4982da154460747592819d1681586b8db1ac0 (diff)
downloadvyos-xe-guest-utilities-af10e84666920b4fbcf425752792938e0f79cd63.tar.gz
vyos-xe-guest-utilities-af10e84666920b4fbcf425752792938e0f79cd63.zip
CA-172846: Tools installed out of date when a Linux VM is freshly installed from templates
Signed-off-by: Phus Lu <phus.lu@citrix.com>
-rw-r--r--mk/Makefile.deb4
-rw-r--r--mk/Makefile.rpm4
-rw-r--r--mk/Makefile.tgz4
3 files changed, 6 insertions, 6 deletions
diff --git a/mk/Makefile.deb b/mk/Makefile.deb
index 3b0617b..276790f 100644
--- a/mk/Makefile.deb
+++ b/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
diff --git a/mk/Makefile.rpm b/mk/Makefile.rpm
index 5cdedcb..8bd61ec 100644
--- a/mk/Makefile.rpm
+++ b/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
diff --git a/mk/Makefile.tgz b/mk/Makefile.tgz
index e710224..7549093 100644
--- a/mk/Makefile.tgz
+++ b/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)/%