File bsc1053532-0001-makefile-drop-usage-of-install.... of Package docker-runc

Overview Repositories Revisions Requests Users Attributes Meta

File bsc1053532-0001-makefile-drop-usage-of-install.patch of Package docker-runc (Revision f24b41df7350bb2dc7415e02e2b33640)

Currently displaying revision f24b41df7350bb2dc7415e02e2b33640 , Show latest

From 678f31ecf967c4d859e47b76ec93d6f124d58266 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Mon, 14 Aug 2017 00:10:28 +1000
Subject: [PATCH] makefile: drop usage of --install

The "go build -i" invocation may slightly help with incremental
recompilation, but it will cause builds to fail if $GOROOT is not
writeable by the current user. While this does appear to work sometimes,
it's a concern for external build systems where "-i" causes build errors
for no real gain.

Given the size of the runc project, --install is not really giving us
much anyway.

SUSE-Bug: https://bugzilla.opensuse.org/show_bug.cgi?id=1053532
SUSE-Backport: https://github.com/opencontainers/runc/pull/1555
Signed-off-by: Aleksa Sarai <asarai@suse.de>
---
 Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Index: docker-runc-git.9c2d8d184e5da67c95d601382adf14862e4f2228/Makefile
===================================================================
--- docker-runc-git.9c2d8d184e5da67c95d601382adf14862e4f2228.orig/Makefile
+++ docker-runc-git.9c2d8d184e5da67c95d601382adf14862e4f2228/Makefile
@@ -2,6 +2,8 @@
 	    localtest localunittest localintegration \
 	    test unittest integration
 
+GO := go
+
 PREFIX := $(DESTDIR)/usr/local
 BINDIR := $(PREFIX)/sbin
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
@@ -26,11 +28,11 @@ VERSION := ${shell cat ./VERSION}
 
 SHELL := $(shell command -v bash 2>/dev/null)
 
-all: $(RUNC_LINK)
-	go build -i -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -tags "$(BUILDTAGS)" -o runc .
+runc: $(RUNC_LINK)
+	$(GO) build $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc .
 
 static: $(RUNC_LINK)
-	CGO_ENABLED=1 go build -i -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -o runc .
+	CGO_ENABLED=1 $(GO) build $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc .
 
 release: $(RUNC_LINK)
 	@flag_list=(seccomp selinux apparmor static ambient); \
@@ -54,8 +56,7 @@ release: $(RUNC_LINK)
 			CGO_ENABLED=1; \
 		}; \
 		echo "Building target: $$output"; \
-		rm -rf "${GOPATH}/pkg"; \
-		go build -i -ldflags "$$ldflags" -tags "$$tags" -o "$$output" .; \
+		$(GO) build $(EXTRA_FLAGS) -ldflags "$$ldflags $(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \
 	done
 
 $(RUNC_LINK):
@@ -65,8 +66,8 @@ dbuild: runcimage
 	docker run --rm -v $(CURDIR):/go/src/$(PROJECT) --privileged $(RUNC_IMAGE) make
 
 lint:
-	go vet ./...
-	go fmt ./...
+	$(GO) vet ./...
+	$(GO) fmt ./...
 
 man:
 	man/md2man-all.sh
@@ -83,13 +84,13 @@ localtest:
 unittest: runcimage
 	docker run -e TESTFLAGS -ti --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localunittest
 
-localunittest: all
-	go test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v ./...
+localunittest: runc
+	$(GO) test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v ./...
 
 integration: runcimage
 	docker run -e TESTFLAGS -t --privileged --rm -v $(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localintegration
 
-localintegration: all
+localintegration: runc
 	bats -t tests/integration${TESTFLAGS}
 
 install:
@@ -119,6 +120,6 @@ clean:
 
 validate:
 	script/validate-gofmt
-	go vet ./...
+	$(GO) vet ./...
 
 ci: validate localtest

Places

File bsc1053532-0001-makefile-drop-usage-of-install.patch of Package docker-runc (Revision f24b41df7350bb2dc7415e02e2b33640)

Places