Merge pull request #72 from UnicronNL/current

VEP4600: T1904: update eth1 and eth2 link files for the vep4600

34 files changed, 161 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 8903200..ac4d1ad 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 a88a7de..a88a7de 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 7dcaf03..7dcaf03 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 0000000..db36f5c
--- /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 0000000..7bf1a17
--- /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 0000000..81f3f5b
--- /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 0000000..fe37dfa
--- /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 0000000..a76ecd2
--- /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 0000000..0e848dd
--- /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 0000000..10ad451
--- /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 0000000..57b9450
--- /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 c96ee50..9b466fe 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 0000000..c60acc3
--- /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 1099a60..c49b7bd 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 0000000..c32e5e8
--- /dev/null
+++ b/tools/dell/vep4600/10-eth1-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b6:00.0
+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 0000000..414b2d3
--- /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 0000000..0579dcf
--- /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 0000000..9f9a3c0
--- /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 0000000..8b8c225
--- /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 0000000..a746ada
--- /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 4787e28..7c100ce 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 0000000..4ff7238
--- /dev/null
+++ b/tools/dell/vep4600/10-eth2-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b6:00.1
+Driver=i40e
+
+[Link]
+Name=eth2
diff --git a/tools/vep4600/10-eth3.link b/tools/dell/vep4600/10-eth3-000.link
index 6eb6b2c..824670e 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 2590a99..ed3a80a 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 0147a20..5d21982 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 ffcd101..a00a0c4 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 0000000..3db698a
--- /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 0000000..9858190
--- /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 0000000..62ba54f
--- /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 03251a1..60acba9 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 0000000..e9014fb
--- /dev/null
+++ b/tools/dell/vep4600/10-unused0-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b6:00.2
+Driver=i40e
+
+[Link]
+Name=unused0
diff --git a/tools/vep4600/10-unused1.link b/tools/dell/vep4600/10-unused1-000.link
index 737133f..0860d00 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 0000000..de906fc
--- /dev/null
+++ b/tools/dell/vep4600/10-unused1-001.link
@@ -0,0 +1,6 @@
+[Match]
+Path=pci-0000:b6:00.3
+Driver=i40e
+
+[Link]
+Name=unused1
diff --git a/tools/vep4600/99-default.link b/tools/dell/vep4600/99-default.link
index e69de29..e69de29 100644
--- a/tools/vep4600/99-default.link
+++ b/tools/dell/vep4600/99-default.link