MAAS

Merge ~adam-collard/maas:2.9-machine-resources-absolute-path into maas:2.9

  1. Git
  2. lp:~adam-collard/maas
  3. 2.9-machine-resources-absolute-path
  4. Merge into 2.9
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: 6f557ea6f9db0b3e80daf6f6a6c5deb8ae3bad89
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:2.9-machine-resources-absolute-path
Merge into: maas:2.9
Diff against target: 13 lines (+1/-1)
1 file modified
src/machine-resources/Makefile (+1/-1)
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
MAAS Lander unittests Pending
Review via email: mp+394233@code.launchpad.net

Commit message

LP: #1904245 [machine-resources] Specify absolute path for output

Cherry-pick 1392e69ab132622b2d6618ccfc243d871fa63460

To post a comment you must log in.
Revision history for this message
Adam Collard (adam-collard) wrote :

Self-approve backport

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/machine-resources/Makefile b/src/machine-resources/Makefile
2index 25a12d8..fec3fcd 100644
3--- a/src/machine-resources/Makefile
4+++ b/src/machine-resources/Makefile
5@@ -28,7 +28,7 @@ build: $(BINARIES)
6 .PHONY: build
7
8 $(BINARIES): $(PACKAGE_VENDOR_DIR) $(PACKAGE_DIR)/main.go
9- GOCACHE=$(GO_CACHE_DIR) GOARCH=$(GOARCH_$(notdir $@)) go build -ldflags '-s -w' -o $@ machine-resources
10+ GOCACHE=$(GO_CACHE_DIR) GOARCH=$(GOARCH_$(notdir $@)) go build -ldflags '-s -w' -o $(CURDIR)/$@ machine-resources
11
12 $(PACKAGE_VENDOR_DIR) vendor:
13 rm -rf $(PACKAGE_VENDOR_DIR)

Subscribers

People subscribed via source and target branches