mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
01a8d45370
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>
76 lines
1.9 KiB
Diff
76 lines
1.9 KiB
Diff
From de69555afaf05efcdeea7b7c20c6f7b12f3e1bac Mon Sep 17 00:00:00 2001
|
|
From: Mark Asselstine <mark.asselstine@windriver.com>
|
|
Date: Fri, 20 Jan 2017 11:58:44 -0500
|
|
Subject: [PATCH] context: use golang.org/x/net pkg until we move to go 1.7
|
|
|
|
In go 1.6 the context.go is not yet integrated and as such we will get
|
|
build errors like:
|
|
|
|
walwrap.go:4:2: cannot find package "context" in any of:
|
|
...
|
|
|
|
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
---
|
|
client/README.md | 2 +-
|
|
client/client.go | 2 +-
|
|
daemon/info_unix.go | 2 +-
|
|
integration-cli/docker_api_attach_test.go | 2 +-
|
|
integration-cli/docker_cli_save_load_unix_test.go | 2 +-
|
|
5 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/src/import/client/README.md
|
|
+++ b/src/import/client/README.md
|
|
@@ -8,7 +8,7 @@ For example, to list running containers
|
|
package main
|
|
|
|
import (
|
|
- "context"
|
|
+ "golang.org/x/net/context"
|
|
"fmt"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
--- a/src/import/client/client.go
|
|
+++ b/src/import/client/client.go
|
|
@@ -19,7 +19,7 @@ For example, to list running containers
|
|
package main
|
|
|
|
import (
|
|
- "context"
|
|
+ "golang.org/x/net/context"
|
|
"fmt"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
--- a/src/import/daemon/info_unix.go
|
|
+++ b/src/import/daemon/info_unix.go
|
|
@@ -3,7 +3,7 @@
|
|
package daemon
|
|
|
|
import (
|
|
- "context"
|
|
+ "golang.org/x/net/context"
|
|
"os/exec"
|
|
"strings"
|
|
|
|
--- 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"
|
|
"bytes"
|
|
- "context"
|
|
+ "golang.org/x/net/context"
|
|
"io"
|
|
"net"
|
|
"net/http"
|
|
--- 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
|
|
|
|
import (
|
|
- "context"
|
|
+ "golang.org/x/net/context"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"os"
|