From 16680be42d6ad6e54134f58ac3683924686d6998 Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Fri, 12 Jun 2015 12:15:11 -0700 Subject: [PATCH] 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. --- Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go | 2 +- .../src/github.com/d2g/dhcp4client/pktsock_linux.go | 2 +- .../src/github.com/vishvananda/netlink/addr_linux.go | 2 +- .../src/github.com/vishvananda/netlink/link_linux.go | 2 +- .../src/github.com/vishvananda/netlink/neigh_linux.go | 2 +- .../src/github.com/vishvananda/netlink/netlink.go | 2 +- .../src/github.com/vishvananda/netlink/protinfo_linux.go | 2 +- .../src/github.com/vishvananda/netlink/route_linux.go | 2 +- .../src/github.com/vishvananda/netlink/xfrm_policy_linux.go | 2 +- .../src/github.com/vishvananda/netlink/xfrm_state_linux.go | 2 +- Godeps/_workspace/src/golang.org/x/sys/unix/creds_test.go | 2 +- .../_workspace/src/golang.org/x/sys/unix/mmap_unix_test.go | 2 +- .../src/golang.org/x/sys/unix/syscall_bsd_test.go | 2 +- Godeps/_workspace/src/golang.org/x/sys/unix/syscall_test.go | 2 +- .../src/golang.org/x/sys/unix/syscall_unix_test.go | 2 +- build | 2 +- pkg/ip/ipmasq.go | 2 +- pkg/ip/link.go | 2 +- pkg/ip/route.go | 2 +- pkg/plugin/ipam.go | 2 +- plugins/ipam/dhcp/daemon.go | 2 +- plugins/ipam/dhcp/lease.go | 6 +++--- plugins/ipam/dhcp/options.go | 2 +- plugins/ipam/dhcp/options_test.go | 2 +- plugins/main/bridge/bridge.go | 2 +- plugins/main/ipvlan/ipvlan.go | 2 +- plugins/main/macvlan/macvlan.go | 2 +- plugins/main/veth/veth.go | 2 +- 28 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go b/Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go index ab44370b..ab852c65 100644 --- 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 39273043..a21c265f 100644 --- 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 31e6b5f3..dd26f4ae 100644 --- 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 37605dca..8b0da0d5 100644 --- 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 ca97a96f..1fdaa3a3 100644 --- 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 3130a4b3..41ebdb11 100644 --- 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 a292d1c7..7181eba1 100644 --- 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 ef59cf77..43872aa4 100644 --- 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 f93be547..6fe1b637 100644 --- 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 f193e5cc..0f1fbd0e 100644 --- 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 9129629e..30694a0f 100644 --- 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 1640262a..04d5720f 100644 --- 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 215b3b0f..55d88430 100644 --- 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 dda14006..9c57d9cd 100644 --- 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 ca621473..bcc79d19 100644 --- 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 1821c8c7..a7173b0c 100755 --- 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 665189bc..7f8740df 100644 --- 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 c99f4f3c..3936ed9d 100644 --- 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 f310f1e3..04e660ef 100644 --- 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 f5a50333..6718ed24 100644 --- 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 f39c58ee..7b5ecfb1 100644 --- 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 7a6377e5..fe23fb09 100644 --- 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 1064daa6..37cfc613 100644 --- 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 3b4f8013..52b27304 100644 --- 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 5a311ec3..dbc48b1a 100644 --- 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 9ca1ca1d..a0405524 100644 --- 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 4d3a94a0..5dd9b6c3 100644 --- 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 7cfdc176..5d343932 100644 --- 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"