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.
This commit is contained in:
2
Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go
generated
vendored
2
Godeps/_workspace/src/github.com/d2g/dhcp4client/client.go
generated
vendored
@ -6,7 +6,7 @@ import (
|
||||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/appc/cni/Godeps/_workspace/src/github.com/d2g/dhcp4"
|
||||
"github.com/d2g/dhcp4"
|
||||
)
|
||||
|
||||
const (
|
||||
|
2
Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go
generated
vendored
2
Godeps/_workspace/src/github.com/d2g/dhcp4client/pktsock_linux.go
generated
vendored
@ -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 (
|
||||
|
2
Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
generated
vendored
2
Godeps/_workspace/src/github.com/vishvananda/netlink/addr_linux.go
generated
vendored
@ -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.
|
||||
|
2
Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
generated
vendored
2
Godeps/_workspace/src/github.com/vishvananda/netlink/link_linux.go
generated
vendored
@ -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()
|
||||
|
2
Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
generated
vendored
2
Godeps/_workspace/src/github.com/vishvananda/netlink/neigh_linux.go
generated
vendored
@ -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 (
|
||||
|
2
Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
generated
vendored
2
Godeps/_workspace/src/github.com/vishvananda/netlink/netlink.go
generated
vendored
@ -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 (
|
||||
|
2
Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
generated
vendored
2
Godeps/_workspace/src/github.com/vishvananda/netlink/protinfo_linux.go
generated
vendored
@ -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) {
|
||||
|
2
Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
generated
vendored
2
Godeps/_workspace/src/github.com/vishvananda/netlink/route_linux.go
generated
vendored
@ -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
|
||||
|
2
Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
generated
vendored
2
Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_policy_linux.go
generated
vendored
@ -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) {
|
||||
|
2
Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
generated
vendored
2
Godeps/_workspace/src/github.com/vishvananda/netlink/xfrm_state_linux.go
generated
vendored
@ -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 {
|
||||
|
2
Godeps/_workspace/src/golang.org/x/sys/unix/creds_test.go
generated
vendored
2
Godeps/_workspace/src/golang.org/x/sys/unix/creds_test.go
generated
vendored
@ -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
|
||||
|
2
Godeps/_workspace/src/golang.org/x/sys/unix/mmap_unix_test.go
generated
vendored
2
Godeps/_workspace/src/golang.org/x/sys/unix/mmap_unix_test.go
generated
vendored
@ -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) {
|
||||
|
2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd_test.go
generated
vendored
2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_bsd_test.go
generated
vendored
@ -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
|
||||
|
2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_test.go
generated
vendored
2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_test.go
generated
vendored
@ -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) {
|
||||
|
2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix_test.go
generated
vendored
2
Godeps/_workspace/src/golang.org/x/sys/unix/syscall_unix_test.go
generated
vendored
@ -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
|
||||
|
Reference in New Issue
Block a user