mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
3c435ae8f0
The build method for docker client changed where by the docker cli is now required to be pulled in from a separate git tree to be built. The integration patch to cross compile was also upreved since some parts of it were accepted upstream while other parts have not been accepted at this time. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
76 lines
1.8 KiB
Diff
76 lines
1.8 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/client/README.md
|
|
+++ b/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/client/client.go
|
|
+++ b/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/daemon/info_unix.go
|
|
+++ b/daemon/info_unix.go
|
|
@@ -3,7 +3,7 @@
|
|
package daemon
|
|
|
|
import (
|
|
- "context"
|
|
+ "golang.org/x/net/context"
|
|
"os/exec"
|
|
"strings"
|
|
|
|
--- a/integration-cli/docker_api_attach_test.go
|
|
+++ b/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/integration-cli/docker_cli_save_load_unix_test.go
|
|
+++ b/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"
|