add support for vep1400

34 files changed, 161 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 89032002..ac4d1add 100644
--- a/Makefile
+++ b/Makefile
@@ -197,9 +197,24 @@ vep4600: check_build_config clean prepare
 	@echo "It's not like I'm building this specially for you or anything!"
 	mkdir -p build/config/includes.chroot/etc/systemd/network
 	mkdir -p build/config/includes.chroot/usr/share/initramfs-tools/hooks
-	cp tools/vep4600/90-vep4600.chroot build/config/hooks/live/
-	cp tools/vep4600/*.link build/config/includes.chroot/etc/systemd/network/
-	cp tools/vep4600/vep4600 build/config/includes.chroot/usr/share/initramfs-tools/hooks/
+	cp tools/dell/90-vep.chroot build/config/hooks/live/
+	cp tools/dell/vep4600/*.link build/config/includes.chroot/etc/systemd/network/
+	cp tools/dell/vep-hook build/config/includes.chroot/usr/share/initramfs-tools/hooks/
+	cd $(build_dir)
+	lb build 2>&1 | tee build.log
+	cd ..
+	@scripts/copy-image
+
+.PHONY: vep1400
+.ONESHELL:
+vep1400: check_build_config clean prepare
+	@set -e
+	@echo "It's not like I'm building this specially for you or anything!"
+	mkdir -p build/config/includes.chroot/etc/systemd/network
+	mkdir -p build/config/includes.chroot/usr/share/initramfs-tools/hooks
+	cp tools/dell/90-vep.chroot build/config/hooks/live/
+	cp tools/dell/vep1400/*.link build/config/includes.chroot/etc/systemd/network/
+	cp tools/dell/vep-hook build/config/includes.chroot/usr/share/initramfs-tools/hooks/
 	cd $(build_dir)
 	lb build 2>&1 | tee build.log
 	cd ..
diff --git a/tools/vep4600/90-vep4600.chroot b/tools/dell/90-vep.chroot
index a88a7de1..a88a7de1 100755
--- a/tools/vep4600/90-vep4600.chroot
+++ b/tools/dell/90-vep.chroot
diff --git a/tools/vep4600/vep4600 b/tools/dell/vep-hook
index 7dcaf034..7dcaf034 100755
--- a/tools/vep4600/vep4600
+++ b/tools/dell/vep-hook
diff --git a/tools/dell/vep1400/10-eth0-000.link b/tools/dell/vep1400/10-eth0-000.link
new file mode 100644
index 00000000..db36f5ce
--- /dev/null
+++ b/tools/dell/vep1400/10-eth0-000.link
@@ -0,0 +1,7 @@
+[Match]
+Path=pci-0000:05:00.1
+Driver=ixgbe
+
+[Link]
+Name=eth0
+Alias=SFP+1
diff --git a/tools/dell/vep1400/10-eth1-000.link b/tools/dell/vep1400/10-eth1-000.link
new file mode 100644
index 00000000..7bf1a175
--- /dev/null
+++ b/tools/dell/vep1400/10-eth1-000.link
@@ -0,0 +1,7 @@
+[Match]
+Path=pci-0000:05:00.0
+Driver=ixgbe
+
+[Link]
+Name=eth1
+Alias=SFP+2
diff --git a/tools/dell/vep1400/10-eth2-000.link b/tools/dell/vep1400/10-eth2-000.link
new file mode 100644
index 00000000..81f3f5bc
--- /dev/null
+++ b/tools/dell/vep1400/10-eth2-000.link
@@ -0,0 +1,7 @@
+[Match]
+Path=pci-0000:02:00.2
+Driver=igb
+
+[Link]
+Name=eth2
+Alias=GE1
diff --git a/tools/dell/vep1400/10-eth3-000.link b/tools/dell/vep1400/10-eth3-000.link
new file mode 100644
index 00000000..fe37dfac
--- /dev/null
+++ b/tools/dell/vep1400/10-eth3-000.link
@@ -0,0 +1,7 @@
+[Match]
+Path=pci-0000:02:00.3
+Driver=igb
+
+[Link]
+Name=eth3
+Alias=GE2
diff --git a/tools/dell/vep1400/10-eth4-000.link b/tools/dell/vep1400/10-eth4-000.link
new file mode 100644
index 00000000..a76ecd24
--- /dev/null
+++ b/tools/dell/vep1400/10-eth4-000.link
@@ -0,0 +1,7 @@
+[Match]
+Path=pci-0000:02:00.0
+Driver=igb
+
+[Link]
+Name=eth4
+Alias=GE3
diff --git a/tools/dell/vep1400/10-eth5-000.link b/tools/dell/vep1400/10-eth5-000.link
new file mode 100644
index 00000000..0e848dde
--- /dev/null
+++ b/tools/dell/vep1400/10-eth5-000.link
@@ -0,0 +1,7 @@
+[Match]
+Path=pci-0000:02:00.1
+Driver=igb
+
+[Link]
+Name=eth5
+Alias=GE4
diff --git a/tools/dell/vep1400/10-eth6-000.link b/tools/dell/vep1400/10-eth6-000.link
new file mode 100644
index 00000000..10ad451d
--- /dev/null
+++ b/tools/dell/vep1400/10-eth6-000.link
@@ -0,0 +1,7 @@
+[Match]
+Path=pci-0000:07:00.1
+Driver=ixgbe
+
+[Link]
+Name=eth6
+Alias=GE5
diff --git a/tools/dell/vep1400/10-eth7-000.link b/tools/dell/vep1400/10-eth7-000.link
new file mode 100644
index 00000000..57b94502
--- /dev/null
+++ b/tools/dell/vep1400/10-eth7-000.link
@@ -0,0 +1,7 @@
+[Match]
+Path=pci-0000:07:00.0
+Driver=ixgbe
+
+[Link]
+Name=eth7
+Alias=GE6
diff --git a/tools/vep4600/10-eth0.link b/tools/dell/vep4600/10-eth0-000.link
index c96ee504..9b466fe8 100644
--- a/tools/vep4600/10-eth0.link
+++ b/tools/dell/vep4600/10-eth0-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:04:*
+Path=pci-0000:04:00.0
 Driver=igb
 
 [Link]
diff --git a/tools/dell/vep4600/10-eth0-001.link b/tools/dell/vep4600/10-eth0-001.link
new file mode 100644
index 00000000..c60acc3a
--- /dev/null
+++ b/tools/dell/vep4600/10-eth0-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:05:00.0
+Driver=igb
+
+[Link]
+Name=eth0
diff --git a/tools/vep4600/10-eth1.link b/tools/dell/vep4600/10-eth1-000.link
index 1099a60f..c49b7bda 100644
--- a/tools/vep4600/10-eth1.link
+++ b/tools/dell/vep4600/10-eth1-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:b8:00.0*
+Path=pci-0000:b8:00.0
 Driver=i40e
 
 [Link]
diff --git a/tools/dell/vep4600/10-eth1-001.link b/tools/dell/vep4600/10-eth1-001.link
new file mode 100644
index 00000000..f7af410b
--- /dev/null
+++ b/tools/dell/vep4600/10-eth1-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b6:00.2
+Driver=i40e
+
+[Link]
+Name=eth1
diff --git a/tools/dell/vep4600/10-eth10-000.link b/tools/dell/vep4600/10-eth10-000.link
new file mode 100644
index 00000000..414b2d30
--- /dev/null
+++ b/tools/dell/vep4600/10-eth10-000.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:65:00.3
+Driver=i40e
+
+[Link]
+Name=eth10
diff --git a/tools/dell/vep4600/10-eth11-000.link b/tools/dell/vep4600/10-eth11-000.link
new file mode 100644
index 00000000..0579dcff
--- /dev/null
+++ b/tools/dell/vep4600/10-eth11-000.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:17:00.0
+Driver=i40e
+
+[Link]
+Name=eth11
diff --git a/tools/dell/vep4600/10-eth12-000.link b/tools/dell/vep4600/10-eth12-000.link
new file mode 100644
index 00000000..9f9a3c0c
--- /dev/null
+++ b/tools/dell/vep4600/10-eth12-000.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:17:00.1
+Driver=i40e
+
+[Link]
+Name=eth12
diff --git a/tools/dell/vep4600/10-eth13-000.link b/tools/dell/vep4600/10-eth13-000.link
new file mode 100644
index 00000000..8b8c2254
--- /dev/null
+++ b/tools/dell/vep4600/10-eth13-000.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:17:00.2
+Driver=i40e
+
+[Link]
+Name=eth13
diff --git a/tools/dell/vep4600/10-eth14-000.link b/tools/dell/vep4600/10-eth14-000.link
new file mode 100644
index 00000000..a746ada9
--- /dev/null
+++ b/tools/dell/vep4600/10-eth14-000.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:17:00.3
+Driver=i40e
+
+[Link]
+Name=eth14
diff --git a/tools/vep4600/10-eth2.link b/tools/dell/vep4600/10-eth2-000.link
index 4787e28a..7c100cee 100644
--- a/tools/vep4600/10-eth2.link
+++ b/tools/dell/vep4600/10-eth2-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:b8:00.1*
+Path=pci-0000:b8:00.1
 Driver=i40e
 
 [Link]
diff --git a/tools/dell/vep4600/10-eth2-001.link b/tools/dell/vep4600/10-eth2-001.link
new file mode 100644
index 00000000..c92406b9
--- /dev/null
+++ b/tools/dell/vep4600/10-eth2-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b6:00.3
+Driver=i40e
+
+[Link]
+Name=eth2
diff --git a/tools/vep4600/10-eth3.link b/tools/dell/vep4600/10-eth3-000.link
index 6eb6b2c7..824670ec 100644
--- a/tools/vep4600/10-eth3.link
+++ b/tools/dell/vep4600/10-eth3-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:02:00.1*
+Path=pci-0000:02:00.1
 Driver=igb
 
 [Link]
diff --git a/tools/vep4600/10-eth4.link b/tools/dell/vep4600/10-eth4-000.link
index 2590a99b..ed3a80a2 100644
--- a/tools/vep4600/10-eth4.link
+++ b/tools/dell/vep4600/10-eth4-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:02:00.0*
+Path=pci-0000:02:00.0
 Driver=igb
 
 [Link]
diff --git a/tools/vep4600/10-eth5.link b/tools/dell/vep4600/10-eth5-000.link
index 0147a201..5d21982d 100644
--- a/tools/vep4600/10-eth5.link
+++ b/tools/dell/vep4600/10-eth5-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:02:00.3*
+Path=pci-0000:02:00.3
 Driver=igb
 
 [Link]
diff --git a/tools/vep4600/10-eth6.link b/tools/dell/vep4600/10-eth6-000.link
index ffcd101d..a00a0c43 100644
--- a/tools/vep4600/10-eth6.link
+++ b/tools/dell/vep4600/10-eth6-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:02:00.2*
+Path=pci-0000:02:00.2
 Driver=igb
 
 [Link]
diff --git a/tools/dell/vep4600/10-eth7-000.link b/tools/dell/vep4600/10-eth7-000.link
new file mode 100644
index 00000000..3db698ae
--- /dev/null
+++ b/tools/dell/vep4600/10-eth7-000.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:65:00.0
+Driver=i40e
+
+[Link]
+Name=eth7
diff --git a/tools/dell/vep4600/10-eth8-000.link b/tools/dell/vep4600/10-eth8-000.link
new file mode 100644
index 00000000..9858190a
--- /dev/null
+++ b/tools/dell/vep4600/10-eth8-000.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:65:00.1
+Driver=i40e
+
+[Link]
+Name=eth8
diff --git a/tools/dell/vep4600/10-eth9-000.link b/tools/dell/vep4600/10-eth9-000.link
new file mode 100644
index 00000000..62ba54f2
--- /dev/null
+++ b/tools/dell/vep4600/10-eth9-000.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:65:00.2
+Driver=i40e
+
+[Link]
+Name=eth9
diff --git a/tools/vep4600/10-unused0.link b/tools/dell/vep4600/10-unused0-000.link
index 03251a1a..60acba9f 100644
--- a/tools/vep4600/10-unused0.link
+++ b/tools/dell/vep4600/10-unused0-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:b8:00.2*
+Path=pci-0000:b8:00.2
 Driver=i40e
 
 [Link]
diff --git a/tools/dell/vep4600/10-unused0-001.link b/tools/dell/vep4600/10-unused0-001.link
new file mode 100644
index 00000000..8cec8534
--- /dev/null
+++ b/tools/dell/vep4600/10-unused0-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b6:00.0
+Driver=i40e
+
+[Link]
+Name=unused0
diff --git a/tools/vep4600/10-unused1.link b/tools/dell/vep4600/10-unused1-000.link
index 737133f4..0860d005 100644
--- a/tools/vep4600/10-unused1.link
+++ b/tools/dell/vep4600/10-unused1-000.link
@@ -1,5 +1,5 @@
 [Match]
-Path=pci-0000:b8:00.3*
+Path=pci-0000:b8:00.3
 Driver=i40e
 
 [Link]
diff --git a/tools/dell/vep4600/10-unused1-001.link b/tools/dell/vep4600/10-unused1-001.link
new file mode 100644
index 00000000..8d4a4890
--- /dev/null
+++ b/tools/dell/vep4600/10-unused1-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b6:00.1
+Driver=i40e
+
+[Link]
+Name=unused1
diff --git a/tools/vep4600/99-default.link b/tools/dell/vep4600/99-default.link
index e69de29b..e69de29b 100644
--- a/tools/vep4600/99-default.link
+++ b/tools/dell/vep4600/99-default.link