No more path rewriting

Path rewriting causes too many problems when vendoring
vendored code. When CNI code is vendored into rkt,
godep has problems code already vendored by CNI.

diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go b/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go
index ab44370..ab852c6 100644 (file)
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go
+++ b/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go
@@ -6,7 +6,7 @@ import (
        "net"
        "time"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4"
+       "github.com/d2g/dhcp4"
 )
 
 const (

diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go b/Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go
index 3927304..a21c265 100644 (file)
--- a/Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go
+++ b/Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go
@@ -6,7 +6,7 @@ import (
        "net"
        "time"
 
-       "github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
+       "golang.org/x/sys/unix"
 )
 
 const (

diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
index 31e6b5f..dd26f4a 100644 (file)
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
@@ -6,7 +6,7 @@ import (
        "strings"
        "syscall"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+       "github.com/vishvananda/netlink/nl"
 )
 
 // AddrAdd will add an IP address to a link device.

diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
index 37605dc..8b0da0d 100644 (file)
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
@@ -7,7 +7,7 @@ import (
        "net"
        "syscall"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+       "github.com/vishvananda/netlink/nl"
 )
 
 var native = nl.NativeEndian()

diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
index ca97a96..1fdaa3a 100644 (file)
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
@@ -5,7 +5,7 @@ import (
        "syscall"
        "unsafe"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+       "github.com/vishvananda/netlink/nl"
 )
 
 const (

diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
index 3130a4b..41ebdb1 100644 (file)
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
@@ -11,7 +11,7 @@ package netlink
 import (
        "net"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+       "github.com/vishvananda/netlink/nl"
 )
 
 const (

diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
index a292d1c..7181eba 100644 (file)
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
@@ -4,7 +4,7 @@ import (
        "fmt"
        "syscall"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+       "github.com/vishvananda/netlink/nl"
 )
 
 func LinkGetProtinfo(link Link) (Protinfo, error) {

diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
index ef59cf7..43872aa 100644 (file)
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
@@ -5,7 +5,7 @@ import (
        "net"
        "syscall"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+       "github.com/vishvananda/netlink/nl"
 )
 
 // RtAttr is shared so it is in netlink_linux.go

diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
index f93be54..6fe1b63 100644 (file)
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
@@ -3,7 +3,7 @@ package netlink
 import (
        "syscall"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+       "github.com/vishvananda/netlink/nl"
 )
 
 func selFromPolicy(sel *nl.XfrmSelector, policy *XfrmPolicy) {

diff --git a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
index f193e5c..0f1fbd0 100644 (file)
--- a/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
+++ b/Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
@@ -4,7 +4,7 @@ import (
        "fmt"
        "syscall"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+       "github.com/vishvananda/netlink/nl"
 )
 
 func writeStateAlgo(a *XfrmStateAlgo) []byte {

diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/creds_test.go b/Godeps/_workspace/src/golang.org/x/sys/unix/creds_test.go
index 9129629..30694a0 100644 (file)
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/creds_test.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/creds_test.go
@@ -13,7 +13,7 @@ import (
        "syscall"
        "testing"
 
-       "github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
+       "golang.org/x/sys/unix"
 )
 
 // TestSCMCredentials tests the sending and receiving of credentials

diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/mmap_unix_test.go b/Godeps/_workspace/src/golang.org/x/sys/unix/mmap_unix_test.go
index 1640262..04d5720 100644 (file)
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/mmap_unix_test.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/mmap_unix_test.go
@@ -9,7 +9,7 @@ package unix_test
 import (
        "testing"
 
-       "github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
+       "golang.org/x/sys/unix"
 )
 
 func TestMmap(t *testing.T) {

diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd_test.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd_test.go
index 215b3b0..55d8843 100644 (file)
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd_test.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd_test.go
@@ -9,7 +9,7 @@ package unix_test
 import (
        "testing"
 
-       "github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
+       "golang.org/x/sys/unix"
 )
 
 const MNT_WAIT = 1

diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_test.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_test.go
index dda1400..9c57d9c 100644 (file)
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_test.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_test.go
@@ -9,7 +9,7 @@ package unix_test
 import (
        "testing"
 
-       "github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
+       "golang.org/x/sys/unix"
 )
 
 func testSetGetenv(t *testing.T, key, value string) {

diff --git a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix_test.go b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix_test.go
index ca62147..bcc79d1 100644 (file)
--- a/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix_test.go
+++ b/Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix_test.go
@@ -18,7 +18,7 @@ import (
        "testing"
        "time"
 
-       "github.com/appc/cni/Godeps/_workspace/src/golang.org/x/sys/unix"
+       "golang.org/x/sys/unix"
 )
 
 // Tests that below functions, structures and constants are consistent

diff --git a/build b/build
index 1821c8c..a7173b0 100755 (executable)
--- a/build
+++ b/build
@@ -9,7 +9,7 @@ if [ ! -h gopath/src/${REPO_PATH} ]; then
 fi
 
 export GOBIN=${PWD}/bin
-export GOPATH=${PWD}/gopath
+export GOPATH=${PWD}/gopath:$(pwd)/Godeps/_workspace
 
 echo "Building plugins"
 

diff --git a/pkg/ip/ipmasq.go b/pkg/ip/ipmasq.go
index 665189b..7f8740d 100644 (file)
--- a/pkg/ip/ipmasq.go
+++ b/pkg/ip/ipmasq.go
@@ -18,7 +18,7 @@ import (
        "fmt"
        "net"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables"
+       "github.com/coreos/go-iptables/iptables"
 )
 
 // SetupIPMasq installs iptables rules to masquerade traffic

diff --git a/pkg/ip/link.go b/pkg/ip/link.go
index c99f4f3..3936ed9 100644 (file)
--- a/pkg/ip/link.go
+++ b/pkg/ip/link.go
@@ -20,7 +20,7 @@ import (
        "net"
        "os"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
+       "github.com/vishvananda/netlink"
 )
 
 func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {

diff --git a/pkg/ip/route.go b/pkg/ip/route.go
index f310f1e..04e660e 100644 (file)
--- a/pkg/ip/route.go
+++ b/pkg/ip/route.go
@@ -17,7 +17,7 @@ package ip
 import (
        "net"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
+       "github.com/vishvananda/netlink"
 )
 
 // AddDefaultRoute sets the default route on the given gateway.

diff --git a/pkg/plugin/ipam.go b/pkg/plugin/ipam.go
index f5a5033..6718ed2 100644 (file)
--- a/pkg/plugin/ipam.go
+++ b/pkg/plugin/ipam.go
@@ -23,8 +23,8 @@ import (
        "path/filepath"
        "strings"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
        "github.com/appc/cni/pkg/ip"
+       "github.com/vishvananda/netlink"
 )
 
 // Find returns the full path of the plugin by searching in CNI_PATH

diff --git a/plugins/ipam/dhcp/daemon.go b/plugins/ipam/dhcp/daemon.go
index f39c58e..7b5ecfb 100644 (file)
--- a/plugins/ipam/dhcp/daemon.go
+++ b/plugins/ipam/dhcp/daemon.go
@@ -27,9 +27,9 @@ import (
        "runtime"
        "sync"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/coreos/go-systemd/activation"
        "github.com/appc/cni/pkg/plugin"
        "github.com/appc/cni/pkg/skel"
+       "github.com/coreos/go-systemd/activation"
 )
 
 const listenFdsStart = 3

diff --git a/plugins/ipam/dhcp/lease.go b/plugins/ipam/dhcp/lease.go
index 7a6377e..fe23fb0 100644 (file)
--- a/plugins/ipam/dhcp/lease.go
+++ b/plugins/ipam/dhcp/lease.go
@@ -23,9 +23,9 @@ import (
        "sync"
        "time"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4"
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4client"
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
+       "github.com/d2g/dhcp4"
+       "github.com/d2g/dhcp4client"
+       "github.com/vishvananda/netlink"
 
        "github.com/appc/cni/pkg/ns"
        "github.com/appc/cni/pkg/plugin"

diff --git a/plugins/ipam/dhcp/options.go b/plugins/ipam/dhcp/options.go
index 1064daa..37cfc61 100644 (file)
--- a/plugins/ipam/dhcp/options.go
+++ b/plugins/ipam/dhcp/options.go
@@ -20,8 +20,8 @@ import (
        "net"
        "time"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4"
        "github.com/appc/cni/pkg/plugin"
+       "github.com/d2g/dhcp4"
 )
 
 func parseRouter(opts dhcp4.Options) net.IP {

diff --git a/plugins/ipam/dhcp/options_test.go b/plugins/ipam/dhcp/options_test.go
index 3b4f801..52b2730 100644 (file)
--- a/plugins/ipam/dhcp/options_test.go
+++ b/plugins/ipam/dhcp/options_test.go
@@ -18,8 +18,8 @@ import (
        "net"
        "testing"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4"
        "github.com/appc/cni/pkg/plugin"
+       "github.com/d2g/dhcp4"
 )
 
 func validateRoutes(t *testing.T, routes []plugin.Route) {

diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go
index 5a311ec..dbc48b1 100644 (file)
--- a/plugins/main/bridge/bridge.go
+++ b/plugins/main/bridge/bridge.go
@@ -23,11 +23,11 @@ import (
        "runtime"
        "syscall"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
        "github.com/appc/cni/pkg/ip"
        "github.com/appc/cni/pkg/ns"
        "github.com/appc/cni/pkg/plugin"
        "github.com/appc/cni/pkg/skel"
+       "github.com/vishvananda/netlink"
 )
 
 const defaultBrName = "cni0"

diff --git a/plugins/main/ipvlan/ipvlan.go b/plugins/main/ipvlan/ipvlan.go
index 9ca1ca1..a040552 100644 (file)
--- a/plugins/main/ipvlan/ipvlan.go
+++ b/plugins/main/ipvlan/ipvlan.go
@@ -21,11 +21,11 @@ import (
        "os"
        "runtime"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
        "github.com/appc/cni/pkg/ip"
        "github.com/appc/cni/pkg/ns"
        "github.com/appc/cni/pkg/plugin"
        "github.com/appc/cni/pkg/skel"
+       "github.com/vishvananda/netlink"
 )
 
 type NetConf struct {

diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go
index 4d3a94a..5dd9b6c 100644 (file)
--- a/plugins/main/macvlan/macvlan.go
+++ b/plugins/main/macvlan/macvlan.go
@@ -21,11 +21,11 @@ import (
        "os"
        "runtime"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
        "github.com/appc/cni/pkg/ip"
        "github.com/appc/cni/pkg/ns"
        "github.com/appc/cni/pkg/plugin"
        "github.com/appc/cni/pkg/skel"
+       "github.com/vishvananda/netlink"
 )
 
 type NetConf struct {

diff --git a/plugins/main/veth/veth.go b/plugins/main/veth/veth.go
index 7cfdc17..5d34393 100644 (file)
--- a/plugins/main/veth/veth.go
+++ b/plugins/main/veth/veth.go
@@ -23,7 +23,7 @@ import (
        "os"
        "runtime"
 
-       "github.com/appc/cni/Godeps/_workspace/src/github.com/vishvananda/netlink"
+       "github.com/vishvananda/netlink"
 
        "github.com/appc/cni/pkg/ip"
        "github.com/appc/cni/pkg/ns"