diff options
author | Daniil Baturin <daniil@baturin.org> | 2020-01-01 02:57:14 +0100 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2020-01-01 02:57:14 +0100 |
commit | f0ba322338bdb0d4312adcea576e9ceadb609501 (patch) | |
tree | c7f7a60061b42e99e1e2374bc089a53e11bfcf51 | |
parent | 64277546fc9f94795fd5be043b0906770f9a2459 (diff) | |
parent | f3176ed09a2b8e76ae1ef10d94a6fb727a804591 (diff) | |
download | vyos-build-f0ba322338bdb0d4312adcea576e9ceadb609501.tar.gz vyos-build-f0ba322338bdb0d4312adcea576e9ceadb609501.zip |
Merge branch 'crux' of https://github.com/vyos/vyos-build into crux
-rw-r--r-- | Makefile | 12 | ||||
-rw-r--r-- | tools/vendors_udev/64-vyos-VEP1400-net.rules | 12 | ||||
-rw-r--r-- | tools/vendors_udev/64-vyos-VEP4600-net.rules | 12 |
3 files changed, 31 insertions, 5 deletions
@@ -228,25 +228,27 @@ vep1400: check_build_config clean prepare cd .. @scripts/copy-image -.PHONY: saf51015I +.PHONY: edgecore .ONESHELL: -saf51015I: check_build_config clean prepare +edgecore: 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/lib/udev/rules.d/ cp tools/vendors_udev/64-vyos-SAF51015I-net.rules build/config/includes.chroot/lib/udev/rules.d/ + cp tools/vendors_udev/64-vyos-SAF51003I-net.rules build/config/includes.chroot/lib/udev/rules.d/ cd $(build_dir) lb build 2>&1 | tee build.log cd .. @scripts/copy-image -.PHONY: saf51003I +.PHONY: dell .ONESHELL: -saf51003I: check_build_config clean prepare +dell: 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/lib/udev/rules.d/ - cp tools/vendors_udev/64-vyos-SAF51003I-net.rules build/config/includes.chroot/lib/udev/rules.d/ + cp tools/vendors_udev/64-vyos-VEP4600-net.rules build/config/includes.chroot/lib/udev/rules.d/ + cp tools/vendors_udev/64-vyos-VEP1400-net.rules build/config/includes.chroot/lib/udev/rules.d/ cd $(build_dir) lb build 2>&1 | tee build.log cd .. diff --git a/tools/vendors_udev/64-vyos-VEP1400-net.rules b/tools/vendors_udev/64-vyos-VEP1400-net.rules new file mode 100644 index 00000000..d14aa8f5 --- /dev/null +++ b/tools/vendors_udev/64-vyos-VEP1400-net.rules @@ -0,0 +1,12 @@ +ATTR{[dmi/id]board_name}!="VEP-1400", GOTO="end_dell_nic" + +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.1", ENV{VYOS_IFNAME}="eth0", ATTR{ifalias}="SFP+1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:05:00.0", ENV{VYOS_IFNAME}="eth1", ATTR{ifalias}="SFP+2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.2", ENV{VYOS_IFNAME}="eth2", ATTR{ifalias}="GE1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.3", ENV{VYOS_IFNAME}="eth3", ATTR{ifalias}="GE2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.0", ENV{VYOS_IFNAME}="eth4", ATTR{ifalias}="GE3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.1", ENV{VYOS_IFNAME}="eth5", ATTR{ifalias}="GE4" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:07:00.1", ENV{VYOS_IFNAME}="eth6", ATTR{ifalias}="GE5" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:07:00.0", ENV{VYOS_IFNAME}="eth7", ATTR{ifalias}="GE6" + +LABEL="end_dell_nic"
\ No newline at end of file diff --git a/tools/vendors_udev/64-vyos-VEP4600-net.rules b/tools/vendors_udev/64-vyos-VEP4600-net.rules new file mode 100644 index 00000000..21aa166d --- /dev/null +++ b/tools/vendors_udev/64-vyos-VEP4600-net.rules @@ -0,0 +1,12 @@ +ATTR{[dmi/id]board_name}!="VEP-4600", GOTO="end_dell_nic" + +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:b6:00.0", ENV{VYOS_IFNAME}="eth1" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:b6:00.1", ENV{VYOS_IFNAME}="eth2" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.1", ENV{VYOS_IFNAME}="eth3" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.0", ENV{VYOS_IFNAME}="eth4" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.3", ENV{VYOS_IFNAME}="eth5" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:02:00.2", ENV{VYOS_IFNAME}="eth6" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:b6:00.2", NAME="unused0" +ACTION=="add", SUBSYSTEM=="net", KERNELS=="0000:b6:00.3", NAME="unused1" + +LABEL="end_dell_nic"
\ No newline at end of file |