From 01a8d4537012ad93dc8510e9b762acdc8c4536c7 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Wed, 13 Sep 2017 12:39:46 -0700 Subject: nets, docker, runc, oci-*tools: go.bbclass compile fixes Recently in the oe-core the go.bbclass changed and requires the defition of the GO_IMPORT variable. This was intended to simplify how the compilation works with go packages and it is still a work in progress. This patch set makes the recipes compatible to generate the same end result as before using the new go.bbclass from oe-core. Any patches that were included in the recipes had to have the paths adjusted because the new go.bbclass manipulates the notion of S to be S + "src" + "$GO_IMPORT" internally for the purpose of unpack, patch and compile. Signed-off-by: Jason Wessel Signed-off-by: Bruce Ashfield --- ...se-golang.org-x-net-pkg-until-we-move-to-go.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch') diff --git a/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch b/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch index c43a7e74..7ed606ff 100644 --- a/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch +++ b/recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch @@ -18,8 +18,8 @@ Signed-off-by: Mark Asselstine integration-cli/docker_cli_save_load_unix_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) ---- a/client/README.md -+++ b/client/README.md +--- a/src/import/client/README.md ++++ b/src/import/client/README.md @@ -8,7 +8,7 @@ For example, to list running containers package main @@ -29,8 +29,8 @@ Signed-off-by: Mark Asselstine "fmt" "github.com/docker/docker/api/types" ---- a/client/client.go -+++ b/client/client.go +--- a/src/import/client/client.go ++++ b/src/import/client/client.go @@ -19,7 +19,7 @@ For example, to list running containers package main @@ -40,8 +40,8 @@ Signed-off-by: Mark Asselstine "fmt" "github.com/docker/docker/api/types" ---- a/daemon/info_unix.go -+++ b/daemon/info_unix.go +--- a/src/import/daemon/info_unix.go ++++ b/src/import/daemon/info_unix.go @@ -3,7 +3,7 @@ package daemon @@ -51,8 +51,8 @@ Signed-off-by: Mark Asselstine "os/exec" "strings" ---- a/integration-cli/docker_api_attach_test.go -+++ b/integration-cli/docker_api_attach_test.go +--- a/src/import/integration-cli/docker_api_attach_test.go ++++ b/src/import/integration-cli/docker_api_attach_test.go @@ -3,7 +3,7 @@ package main import ( "bufio" @@ -62,8 +62,8 @@ Signed-off-by: Mark Asselstine "io" "net" "net/http" ---- a/integration-cli/docker_cli_save_load_unix_test.go -+++ b/integration-cli/docker_cli_save_load_unix_test.go +--- a/src/import/integration-cli/docker_cli_save_load_unix_test.go ++++ b/src/import/integration-cli/docker_cli_save_load_unix_test.go @@ -3,7 +3,7 @@ package main -- cgit v1.2.3-54-g00ecf