diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2017-09-13 12:39:46 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-09-14 09:49:00 -0400 |
commit | 01a8d4537012ad93dc8510e9b762acdc8c4536c7 (patch) | |
tree | 8b22ba0333f7a8c83193bee31b33a3b307f1164a /recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch | |
parent | 718592922bd64da4d609c96e831f6aba05e44a8d (diff) | |
download | meta-virtualization-01a8d4537012ad93dc8510e9b762acdc8c4536c7.tar.gz |
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 <jason.wessel@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch')
-rw-r--r-- | recipes-containers/docker/files/context-use-golang.org-x-net-pkg-until-we-move-to-go.patch | 20 |
1 files changed, 10 insertions, 10 deletions
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 <mark.asselstine@windriver.com> | |||
18 | integration-cli/docker_cli_save_load_unix_test.go | 2 +- | 18 | integration-cli/docker_cli_save_load_unix_test.go | 2 +- |
19 | 5 files changed, 5 insertions(+), 5 deletions(-) | 19 | 5 files changed, 5 insertions(+), 5 deletions(-) |
20 | 20 | ||
21 | --- a/client/README.md | 21 | --- a/src/import/client/README.md |
22 | +++ b/client/README.md | 22 | +++ b/src/import/client/README.md |
23 | @@ -8,7 +8,7 @@ For example, to list running containers | 23 | @@ -8,7 +8,7 @@ For example, to list running containers |
24 | package main | 24 | package main |
25 | 25 | ||
@@ -29,8 +29,8 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | |||
29 | "fmt" | 29 | "fmt" |
30 | 30 | ||
31 | "github.com/docker/docker/api/types" | 31 | "github.com/docker/docker/api/types" |
32 | --- a/client/client.go | 32 | --- a/src/import/client/client.go |
33 | +++ b/client/client.go | 33 | +++ b/src/import/client/client.go |
34 | @@ -19,7 +19,7 @@ For example, to list running containers | 34 | @@ -19,7 +19,7 @@ For example, to list running containers |
35 | package main | 35 | package main |
36 | 36 | ||
@@ -40,8 +40,8 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | |||
40 | "fmt" | 40 | "fmt" |
41 | 41 | ||
42 | "github.com/docker/docker/api/types" | 42 | "github.com/docker/docker/api/types" |
43 | --- a/daemon/info_unix.go | 43 | --- a/src/import/daemon/info_unix.go |
44 | +++ b/daemon/info_unix.go | 44 | +++ b/src/import/daemon/info_unix.go |
45 | @@ -3,7 +3,7 @@ | 45 | @@ -3,7 +3,7 @@ |
46 | package daemon | 46 | package daemon |
47 | 47 | ||
@@ -51,8 +51,8 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | |||
51 | "os/exec" | 51 | "os/exec" |
52 | "strings" | 52 | "strings" |
53 | 53 | ||
54 | --- a/integration-cli/docker_api_attach_test.go | 54 | --- a/src/import/integration-cli/docker_api_attach_test.go |
55 | +++ b/integration-cli/docker_api_attach_test.go | 55 | +++ b/src/import/integration-cli/docker_api_attach_test.go |
56 | @@ -3,7 +3,7 @@ package main | 56 | @@ -3,7 +3,7 @@ package main |
57 | import ( | 57 | import ( |
58 | "bufio" | 58 | "bufio" |
@@ -62,8 +62,8 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | |||
62 | "io" | 62 | "io" |
63 | "net" | 63 | "net" |
64 | "net/http" | 64 | "net/http" |
65 | --- a/integration-cli/docker_cli_save_load_unix_test.go | 65 | --- a/src/import/integration-cli/docker_cli_save_load_unix_test.go |
66 | +++ b/integration-cli/docker_cli_save_load_unix_test.go | 66 | +++ b/src/import/integration-cli/docker_cli_save_load_unix_test.go |
67 | @@ -3,7 +3,7 @@ | 67 | @@ -3,7 +3,7 @@ |
68 | package main | 68 | package main |
69 | 69 | ||