vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #537 from dmbaturin/veps

Browse Source 
build flavors: T3664: reimplement Dell VEP flavors using the new system
This commit is contained in:
John Estabrook 2024-03-23 15:15:37 -05:00 committed by GitHub
commit f08721e15b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
36 changed files with 394 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
data/build-flavors/dell-vep1400.toml Normal file
View File

@ -0,0 +1,116 @@
# ISO image for Dell VEP4600 devices
image_formats = "iso"
# Replace built-in NIC naming rules with empty files
# to prevent them from taking any effect
[[includes_chroot]]
path = "lib/systemd/network/99-default.link"
data = ''
[[includes_chroot]]
path = "lib/udev/rules.d/65-vyatta-net.rules"
data = ''
[[includes_chroot]]
path = "lib/udev/rules.d/75-persistent-net-generator.rules"
data = ''
# Install platform-specific link files
[[includes_chroot]]
path = "etc/systemd/network/10-eth0-000.link"
data = '''
[Match]
Path=pci-0000:05:00.1
Driver=ixgbe
[Link]
Name=eth0
Alias=SFP+1
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth1-000.link"
data = '''
[Match]
Path=pci-0000:05:00.0
Driver=ixgbe
[Link]
Name=eth1
Alias=SFP+2
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth2-000.link"
data = '''
[Match]
Path=pci-0000:02:00.2
Driver=igb
[Link]
Name=eth2
Alias=GE1
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth3-000.link"
data = '''
[Match]
Path=pci-0000:02:00.3
Driver=igb
[Link]
Name=eth3
Alias=GE2
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth4-000.link"
data = '''
[Match]
Path=pci-0000:02:00.0
Driver=igb
[Link]
Name=eth4
Alias=GE3
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth5-000.link"
data = '''
[Match]
Path=pci-0000:02:00.1
Driver=igb
[Link]
Name=eth5
Alias=GE4
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth6-000.link"
data = '''
[Match]
Path=pci-0000:07:00.1
Driver=ixgbe
[Link]
Name=eth6
Alias=GE5
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth7-000.link"
data = '''
[Match]
Path=pci-0000:07:00.0
Driver=ixgbe
[Link]
Name=eth7
Alias=GE6
'''

267
data/build-flavors/dell-vep4600.toml Normal file
View File

@ -0,0 +1,267 @@
# ISO image for Dell VEP4600 devices
image_formats = "iso"
# Replace built-in NIC naming rules with empty files
# to prevent them from taking any effect
[[includes_chroot]]
path = "lib/systemd/network/99-default.link"
data = ''
[[includes_chroot]]
path = "lib/udev/rules.d/65-vyatta-net.rules"
data = ''
[[includes_chroot]]
path = "lib/udev/rules.d/75-persistent-net-generator.rules"
data = ''
# Install platform-specific link files
[[includes_chroot]]
path = "etc/systemd/network/10-eth0-000.link"
data = '''
[Match]
Path=pci-0000:04:00.0
Driver=igb
[Link]
Name=eth0
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth0-001.link"
data = '''
[Match]
Path=pci-0000:05:00.0
Driver=igb
[Link]
Name=eth0
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth10-000.link"
data = '''
[Match]
Path=pci-0000:65:00.3
Driver=i40e
[Link]
Name=eth10
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth1-000.link"
data = '''
[Match]
Path=pci-0000:b8:00.0
Driver=i40e
[Link]
Name=eth1
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth1-001.link"
data = '''
[Match]
Path=pci-0000:b6:00.0
Driver=i40e
[Link]
Name=eth1
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth11-000.link"
data = '''
[Match]
Path=pci-0000:17:00.0
Driver=i40e
[Link]
Name=eth11
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth12-000.link"
data = '''
[Match]
Path=pci-0000:17:00.1
Driver=i40e
[Link]
Name=eth12
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth13-000.link"
data = '''
[Match]
Path=pci-0000:17:00.2
Driver=i40e
[Link]
Name=eth13
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth14-000.link"
data = '''
[Match]
Path=pci-0000:17:00.3
Driver=i40e
[Link]
Name=eth14
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth2-000.link"
data = '''
[Match]
Path=pci-0000:b8:00.1
Driver=i40e
[Link]
Name=eth2
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth2-001.link"
data = '''
[Match]
Path=pci-0000:b6:00.1
Driver=i40e
[Link]
Name=eth2
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth3-000.link"
data = '''
[Match]
Path=pci-0000:02:00.1
Driver=igb
[Link]
Name=eth3
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth4-000.link"
data = '''
[Match]
Path=pci-0000:02:00.0
Driver=igb
[Link]
Name=eth4
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth5-000.link"
data = '''
[Match]
Path=pci-0000:02:00.3
Driver=igb
[Link]
Name=eth5
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth6-000.link"
data = '''
[Match]
Path=pci-0000:02:00.2
Driver=igb
[Link]
Name=eth6
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth7-000.link"
data = '''
[Match]
Path=pci-0000:65:00.0
Driver=i40e
[Link]
Name=eth7
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth8-000.link"
data = '''
[Match]
Path=pci-0000:65:00.1
Driver=i40e
[Link]
Name=eth8
'''
[[includes_chroot]]
path = "etc/systemd/network/10-eth9-000.link"
data = '''
[Match]
Path=pci-0000:65:00.2
Driver=i40e
[Link]
Name=eth9
'''
[[includes_chroot]]
path = "etc/systemd/network/10-unused0-000.link"
data = '''
[Match]
Path=pci-0000:b8:00.2
Driver=i40e
[Link]
Name=unused0
'''
[[includes_chroot]]
path = "etc/systemd/network/10-unused0-001.link"
data = '''
[Match]
Path=pci-0000:b6:00.2
Driver=i40e
[Link]
Name=unused0
'''
[[includes_chroot]]
path = "etc/systemd/network/10-unused1-000.link"
data = '''
[Match]
Path=pci-0000:b8:00.3
Driver=i40e
[Link]
Name=unused1
'''
[[includes_chroot]]
path = "etc/systemd/network/10-unused1-001.link"
data = '''
[Match]
Path=pci-0000:b6:00.3
Driver=i40e
[Link]
Name=unused1
'''
[[includes_chroot]]
path = "etc/systemd/network/99-default.link"
data = '''
'''

8
scripts/build-vyos-image
View File

@ -193,9 +193,17 @@ if __name__ == "__main__":
pre_build_config = merge_dicts({}, build_defaults) pre_build_config = merge_dicts({}, build_defaults)
flavor_config = {} flavor_config = {}
build_flavor = args["build_flavor"]
try:
with open(make_toml_path(defaults.BUILD_FLAVORS_DIR, args["build_flavor"]), 'rb') as f: with open(make_toml_path(defaults.BUILD_FLAVORS_DIR, args["build_flavor"]), 'rb') as f:
flavor_config = tomli.load(f) flavor_config = tomli.load(f)
pre_build_config = merge_dicts(flavor_config, pre_build_config) pre_build_config = merge_dicts(flavor_config, pre_build_config)
except FileNotFoundError:
print(f"E: Flavor '{build_flavor}' does not exist")
sys.exit(1)
except tomli.TOMLDecodeError as e:
print(f"E: Failed to parse TOML file for flavor '{build_flavor}': {e}")
sys.exit(1)
## Combine configs args > flavor > defaults ## Combine configs args > flavor > defaults
pre_build_config = merge_dicts(args, pre_build_config, skip_none=True) pre_build_config = merge_dicts(args, pre_build_config, skip_none=True)

16
tools/dell/90-vep.chroot
View File

@ -1,16 +0,0 @@
#!/bin/sh
echo I: Change the default serial baud rate.
sed -i 's/9600/115200/g' /opt/vyatta/etc/config-migrate/migrate/system/3-to-4
echo "ShowStatus=yes" >> /etc/systemd/system.conf
echo I: Disable default link rule.
rm /lib/systemd/network/99-default.link
touch /lib/systemd/network/99-default.link
rm /lib/udev/rules.d/65-vyatta-net.rules
touch /lib/udev/rules.d/65-vyatta-net.rules
rm /lib/udev/rules.d/75-persistent-net-generator.rules
touch /lib/udev/rules.d/75-persistent-net-generator.rules
echo I: Update initramfs.
update-initramfs -u

28
tools/dell/vep-hook
View File

@ -1,28 +0,0 @@
#!/bin/sh -e
PREREQS=""
prereqs() { echo "$PREREQS"; }
case "$1" in
prereqs)
prereqs
exit 0
;;
esac
. /usr/share/initramfs-tools/hook-functions
mkdir -p $DESTDIR/etc/systemd/network
cp -p /etc/systemd/network/*.link $DESTDIR/etc/systemd/network/
mkdir -p $DESTDIR/lib/udev/rules.d
cp -p /lib/udev/rules.d/50-firmware.rules $DESTDIR/lib/udev/rules.d/
cp -p /lib/udev/rules.d/50-udev-default.rules $DESTDIR/lib/udev/rules.d/
cp -p /lib/udev/rules.d/55-dm.rules $DESTDIR/lib/udev/rules.d/
cp -p /lib/udev/rules.d/60-cdrom_id.rules $DESTDIR/lib/udev/rules.d/
cp -p /lib/udev/rules.d/60-persistent-storage-dm.rules $DESTDIR/lib/udev/rules.d/
cp -p /lib/udev/rules.d/60-persistent-storage.rules $DESTDIR/lib/udev/rules.d/
cp -p /lib/udev/rules.d/75-net-description.rules $DESTDIR/lib/udev/rules.d/
cp -p /lib/udev/rules.d/80-drivers.rules $DESTDIR/lib/udev/rules.d/
cp -p /lib/udev/rules.d/80-net-setup-link.rules $DESTDIR/lib/udev/rules.d/

7
tools/dell/vep1400/10-eth0-000.link
View File

@ -1,7 +0,0 @@
[Match]
Path=pci-0000:05:00.1
Driver=ixgbe
[Link]
Name=eth0
Alias=SFP+1

7
tools/dell/vep1400/10-eth1-000.link
View File

@ -1,7 +0,0 @@
[Match]
Path=pci-0000:05:00.0
Driver=ixgbe
[Link]
Name=eth1
Alias=SFP+2

7
tools/dell/vep1400/10-eth2-000.link
View File

@ -1,7 +0,0 @@
[Match]
Path=pci-0000:02:00.2
Driver=igb
[Link]
Name=eth2
Alias=GE1

7
tools/dell/vep1400/10-eth3-000.link
View File

@ -1,7 +0,0 @@
[Match]
Path=pci-0000:02:00.3
Driver=igb
[Link]
Name=eth3
Alias=GE2

7
tools/dell/vep1400/10-eth4-000.link
View File

@ -1,7 +0,0 @@
[Match]
Path=pci-0000:02:00.0
Driver=igb
[Link]
Name=eth4
Alias=GE3

7
tools/dell/vep1400/10-eth5-000.link
View File

@ -1,7 +0,0 @@
[Match]
Path=pci-0000:02:00.1
Driver=igb
[Link]
Name=eth5
Alias=GE4

7
tools/dell/vep1400/10-eth6-000.link
View File

@ -1,7 +0,0 @@
[Match]
Path=pci-0000:07:00.1
Driver=ixgbe
[Link]
Name=eth6
Alias=GE5

7
tools/dell/vep1400/10-eth7-000.link
View File

@ -1,7 +0,0 @@
[Match]
Path=pci-0000:07:00.0
Driver=ixgbe
[Link]
Name=eth7
Alias=GE6

6
tools/dell/vep4600/10-eth0-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:04:00.0
Driver=igb
[Link]
Name=eth0

6
tools/dell/vep4600/10-eth0-001.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:05:00.0
Driver=igb
[Link]
Name=eth0

6
tools/dell/vep4600/10-eth1-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:b8:00.0
Driver=i40e
[Link]
Name=eth1

6
tools/dell/vep4600/10-eth1-001.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:b6:00.0
Driver=i40e
[Link]
Name=eth1

6
tools/dell/vep4600/10-eth10-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:65:00.3
Driver=i40e
[Link]
Name=eth10

6
tools/dell/vep4600/10-eth11-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:17:00.0
Driver=i40e
[Link]
Name=eth11

6
tools/dell/vep4600/10-eth12-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:17:00.1
Driver=i40e
[Link]
Name=eth12

6
tools/dell/vep4600/10-eth13-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:17:00.2
Driver=i40e
[Link]
Name=eth13

6
tools/dell/vep4600/10-eth14-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:17:00.3
Driver=i40e
[Link]
Name=eth14

6
tools/dell/vep4600/10-eth2-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:b8:00.1
Driver=i40e
[Link]
Name=eth2

6
tools/dell/vep4600/10-eth2-001.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:b6:00.1
Driver=i40e
[Link]
Name=eth2

6
tools/dell/vep4600/10-eth3-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:02:00.1
Driver=igb
[Link]
Name=eth3

6
tools/dell/vep4600/10-eth4-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:02:00.0
Driver=igb
[Link]
Name=eth4

6
tools/dell/vep4600/10-eth5-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:02:00.3
Driver=igb
[Link]
Name=eth5

6
tools/dell/vep4600/10-eth6-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:02:00.2
Driver=igb
[Link]
Name=eth6

6
tools/dell/vep4600/10-eth7-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:65:00.0
Driver=i40e
[Link]
Name=eth7

6
tools/dell/vep4600/10-eth8-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:65:00.1
Driver=i40e
[Link]
Name=eth8

6
tools/dell/vep4600/10-eth9-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:65:00.2
Driver=i40e
[Link]
Name=eth9

6
tools/dell/vep4600/10-unused0-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:b8:00.2
Driver=i40e
[Link]
Name=unused0

6
tools/dell/vep4600/10-unused0-001.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:b6:00.2
Driver=i40e
[Link]
Name=unused0

6
tools/dell/vep4600/10-unused1-000.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:b8:00.3
Driver=i40e
[Link]
Name=unused1

6
tools/dell/vep4600/10-unused1-001.link
View File

@ -1,6 +0,0 @@
[Match]
Path=pci-0000:b6:00.3
Driver=i40e
[Link]
Name=unused1

0
tools/dell/vep4600/99-default.link
View File