The upstream Makefile now calls `$(GO)` instead of just `go` so this patch isn't
needed anymore.
Signed-off-by: Paul Barker <pbar...@toganlabs.com>
---
.../0001-Use-correct-go-cross-compiler.patch | 85 ----------------------
recipes-containers/runc/runc-opencontainers_git.bb | 1 -
2 files changed, 86 deletions(-)
delete mode 100644
recipes-containers/runc/runc-opencontainers/0001-Use-correct-go-cross-compiler.patch
diff --git
a/recipes-containers/runc/runc-opencontainers/0001-Use-correct-go-cross-compiler.patch
b/recipes-containers/runc/runc-opencontainers/0001-Use-correct-go-cross-compiler.patch
deleted file mode 100644
index 67d7014..0000000
---
a/recipes-containers/runc/runc-opencontainers/0001-Use-correct-go-cross-compiler.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 621e5e9a196daaaf5eb430a413fe51218cf42c89 Mon Sep 17 00:00:00 2001
-From: Paul Barker <pbar...@toganlabs.com>
-Date: Wed, 4 Oct 2017 15:45:27 +0000
-Subject: [PATCH] Use correct go cross-compiler
-
-We need to use '${GO}' as set by OpenEmbedded instead of just 'go'. Just using
-'go' will invoke go-native.
-
-Signed-off-by: Paul Barker <pbar...@toganlabs.com>
-Upstream-status: Inappropriate
----
- Makefile | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 6781ac7..74e551d 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -27,18 +27,18 @@ SHELL := $(shell command -v bash 2>/dev/null)
- .DEFAULT: runc
-
- runc: $(SOURCES)
-- go build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X
main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc .
-+ $(GO) build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X
main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o runc .
-
- all: runc recvtty
-
- recvtty: contrib/cmd/recvtty/recvtty
-
- contrib/cmd/recvtty/recvtty: $(SOURCES)
-- go build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X
main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o
contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
-+ $(GO) build -i $(EXTRA_FLAGS) -ldflags "-X main.gitCommit=${COMMIT} -X
main.version=${VERSION} $(EXTRA_LDFLAGS)" -tags "$(BUILDTAGS)" -o
contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
-
- static: $(SOURCES)
-- CGO_ENABLED=1 go build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo
static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X
main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc .
-- CGO_ENABLED=1 go build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo
static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X
main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty
./contrib/cmd/recvtty
-+ CGO_ENABLED=1 $(GO) build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo
static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X
main.version=${VERSION} $(EXTRA_LDFLAGS)" -o runc .
-+ CGO_ENABLED=1 $(GO) build -i $(EXTRA_FLAGS) -tags "$(BUILDTAGS) cgo
static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X
main.version=${VERSION} $(EXTRA_LDFLAGS)" -o contrib/cmd/recvtty/recvtty
./contrib/cmd/recvtty
-
- release:
- @flag_list=(seccomp selinux apparmor static); \
-@@ -62,15 +62,15 @@ release:
- CGO_ENABLED=1; \
- }; \
- echo "Building target: $$output"; \
-- go build -i $(EXTRA_FLAGS) -ldflags "$$ldflags
$(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \
-+ $(GO) build -i $(EXTRA_FLAGS) -ldflags "$$ldflags
$(EXTRA_LDFLAGS)" -tags "$$tags" -o "$$output" .; \
- done
-
- dbuild: runcimage
- docker run --rm -v $(CURDIR):/go/src/$(PROJECT) --privileged
$(RUNC_IMAGE) make clean all
-
- lint:
-- go vet $(allpackages)
-- go fmt $(allpackages)
-+ $(GO) vet $(allpackages)
-+ $(GO) fmt $(allpackages)
-
- man:
- man/md2man-all.sh
-@@ -88,7 +88,7 @@ unittest: runcimage
- docker run -e TESTFLAGS -t --privileged --rm -v
$(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localunittest
-
- localunittest: all
-- go test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v $(allpackages)
-+ $(GO) test -timeout 3m -tags "$(BUILDTAGS)" ${TESTFLAGS} -v
$(allpackages)
-
- integration: runcimage
- docker run -e TESTFLAGS -t --privileged --rm -v
$(CURDIR):/go/src/$(PROJECT) $(RUNC_IMAGE) make localintegration
-@@ -133,10 +133,10 @@ clean:
-
- validate:
- script/validate-gofmt
-- go vet $(allpackages)
-+ $(GO) vet $(allpackages)
-
- ci: validate localtest
-
- # memoize allpackages, so that it's executed only once and only if used
--_allpackages = $(shell go list ./... | grep -v vendor)
-+_allpackages = $(shell $(GO) list ./... | grep -v vendor)
- allpackages = $(if $(__allpackages),,$(eval __allpackages :=
$$(_allpackages)))$(__allpackages)
---
-2.7.4
-
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb
b/recipes-containers/runc/runc-opencontainers_git.bb
index 73ef4f0..ed48abf 100644
--- a/recipes-containers/runc/runc-opencontainers_git.bb
+++ b/recipes-containers/runc/runc-opencontainers_git.bb
@@ -3,6 +3,5 @@ include runc.inc
SRCREV = "58415b4b12650291f435db8770cea48207b78afe"
SRC_URI = " \
git://github.com/opencontainers/runc;branch=master \
- file://0001-Use-correct-go-cross-compiler.patch \
"
RUNC_VERSION = "1.0.0-rc5"
--
2.7.4
--
_______________________________________________
meta-virtualization mailing list
meta-virtualization@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-virtualization
