Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into public-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
renukamanavalan committed Aug 29, 2023
2 parents 94a11ab + d0a40af commit f150684
Show file tree
Hide file tree
Showing 114 changed files with 2,240 additions and 519 deletions.
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7050dx4_32s/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@
id: '1466'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
Data Fabric: Device 18h; Function 6'
- bus: '00'
dev: '18'
fn: '7'
id: '0001'
name: 'Host bridge: Arastra Inc. Device 0001'
- bus: '01'
dev: '00'
fn: '0'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7050px4_32s/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@
id: '1466'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
Data Fabric: Device 18h; Function 6'
- bus: '00'
dev: '18'
fn: '7'
id: '0001'
name: 'Host bridge: Arastra Inc. Device 0001'
- bus: '01'
dev: '00'
fn: '0'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7050sx3_48c8/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@
id: '1578'
name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
Security Processor'
- bus: '00'
dev: 09
fn: '0'
id: '0001'
name: 'Host bridge: Arastra Inc. Device 0001'
- bus: '00'
dev: 09
fn: '2'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7050sx3_48yc8/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@
id: '1578'
name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
Security Processor'
- bus: '00'
dev: 09
fn: '0'
id: '0001'
name: 'Host bridge: Arastra Inc. Device 0001'
- bus: '00'
dev: 09
fn: '2'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7060dx4_32/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,6 @@
id: 6f37
name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
D R3 QPI Link 0/1 (rev 03)'
- bus: ff
dev: 0b
fn: '3'
id: '0001'
name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
- bus: ff
dev: 0c
fn: '0'
Expand Down
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7060dx5_32/pcie.yaml
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7060dx5_64s/pcie.yaml
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7060px4_32/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,6 @@
id: 6f37
name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
D R3 QPI Link 0/1 (rev 03)'
- bus: ff
dev: 0b
fn: '3'
id: '0001'
name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
- bus: ff
dev: 0c
fn: '0'
Expand Down
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7060px5_64s/pcie.yaml
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7170_32cd/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,6 @@
id: 6f37
name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
D R3 QPI Link 0/1 (rev 03)'
- bus: ff
dev: 0b
fn: '3'
id: '0001'
name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
- bus: ff
dev: 0c
fn: '0'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7170_64c/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,6 @@
id: 6f37
name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
D R3 QPI Link 0/1 (rev 03)'
- bus: ff
dev: 0b
fn: '3'
id: '0001'
name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
- bus: ff
dev: 0c
fn: '0'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_720dt_48s/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,6 @@
id: 15ee
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Raven/Raven2 Device 24: Function
6'
- bus: '00'
dev: '18'
fn: '7'
id: '0001'
name: 'Host bridge: Arista Networks, Inc. Device 0001'
- bus: '01'
dev: '00'
fn: '0'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7260cx3_64/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,6 @@
id: 6f37
name: 'Performance counters: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon
D R3 QPI Link 0/1 (rev 03)'
- bus: ff
dev: 0b
fn: '3'
id: '0001'
name: 'System peripheral: Arastra Inc. Device 0001 (rev 03)'
- bus: ff
dev: 0c
fn: '0'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7280cr3_32p4/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@
id: '1578'
name: 'Encryption controller: Advanced Micro Devices, Inc. [AMD] Carrizo Platform
Security Processor'
- bus: '00'
dev: 09
fn: '0'
id: '0001'
name: 'Host bridge: Arista Networks, Inc. Device 0001'
- bus: '00'
dev: 09
fn: '2'
Expand Down
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_7800_sup/pcie.yaml
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7800r3_48cq2_lc/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@
id: '1466'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
Data Fabric: Device 18h; Function 6'
- bus: '00'
dev: '18'
fn: '7'
id: '0001'
name: 'Host bridge: Arista Networks, Inc. Device 0001'
- bus: '04'
dev: '00'
fn: '0'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7800r3_48cqm2_lc/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@
id: '1466'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
Data Fabric: Device 18h; Function 6'
- bus: '00'
dev: '18'
fn: '7'
id: '0001'
name: 'Host bridge: Arista Networks, Inc. Device 0001'
- bus: '04'
dev: '00'
fn: '0'
Expand Down
5 changes: 0 additions & 5 deletions device/arista/x86_64-arista_7800r3a_36d2_lc/pcie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@
id: '1466'
name: 'Host bridge: Advanced Micro Devices, Inc. [AMD] Family 17h (Models 00h-0fh)
Data Fabric: Device 18h; Function 6'
- bus: '00'
dev: '18'
fn: '7'
id: '0001'
name: 'Host bridge: Arista Networks, Inc. Device 0001'
- bus: '04'
dev: '00'
fn: '0'
Expand Down
1 change: 1 addition & 0 deletions device/arista/x86_64-arista_common/pcie.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
8 changes: 7 additions & 1 deletion device/dell/x86_64-dell_s6100_c2538-r0/platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,13 @@
},
{
"name": "QSFP+ or later"
}
},
{
"name": "SFP/SFP+/SFP28"
},
{
"name": "SFP/SFP+/SFP28"
}
]
},
"interfaces": {}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"services_to_ignore": [],
"devices_to_ignore": ["fan.speed"],
"user_defined_checkers": [],
"polling_interval": 60,
"led_color": {
"fault" : "amber",
"normal" : "green",
"booting": "blinking_green"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"services_to_ignore": [],
"devices_to_ignore": ["fan.speed"],
"user_defined_checkers": [],
"polling_interval": 60,
"led_color": {
"fault" : "amber",
"normal" : "green",
"booting": "blinking_green"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"services_to_ignore": [],
"devices_to_ignore": ["fan.speed"],
"user_defined_checkers": [],
"polling_interval": 60,
"led_color": {
"fault" : "amber",
"normal" : "green",
"booting": "blinking_green"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<!-- Number of ports in the following port list -->
<number-of-physical-ports>65</number-of-physical-ports>

<!-- Global port late create -->
<late-create-all-ports>1</late-create-all-ports>

<!-- List of ports in the device -->
<ports-list>
<port-info>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<!-- Number of ports in the following port list -->
<number-of-physical-ports>65</number-of-physical-ports>

<!-- Global port late create -->
<late-create-all-ports>1</late-create-all-ports>

<!-- List of ports in the device -->
<ports-list>
<port-info>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
applibs==1.mlnx.4.5.5142
applibs-dev==1.mlnx.4.5.5142
applibs==1.mlnx.4.6.1020
applibs-dev==1.mlnx.4.6.1020
bfnplatform==1.0.0
isc-dhcp-relay==4.4.1-2.3+deb11u2
kernel-mft-dkms==4.22.1-15
kernel-mft-dkms==4.25.0-62
libdashapi==1.0.0
libhiredis-dev==0.14.1-1
libhiredis0.14==0.14.1-1
Expand Down Expand Up @@ -43,7 +43,8 @@ linux-headers-5.10.0-18-2-amd64==5.10.140-1
linux-headers-5.10.0-18-2-common==5.10.140-1
lldpd==1.0.4-1
lm-sensors==1:3.6.0-7
mft==4.22.1-15
mft==4.25.0-62
mlnx-sai==1.mlnx.SAIBuild2305.25.0.3
net-tools==1.60+git20181103.0eebece-1
protobuf-compiler==3.21.12-3
python-thrift==0.11.0-4
Expand All @@ -59,22 +60,21 @@ sonic-mgmt-common-codegen==1.0.0
sonic-platform-pddf==1.1
sonic-platform-pddf-sym==1.1
swss==1.0.0
sx-acl-helper==1.mlnx.4.5.5142
sx-acl-helper-dev==1.mlnx.4.5.5142
sx-complib==1.mlnx.4.5.5142
sx-complib-dev==1.mlnx.4.5.5142
sx-examples==1.mlnx.4.5.5142
sx-examples-dev==1.mlnx.4.5.5142
sx-gen-utils==1.mlnx.4.5.5142
sx-gen-utils-dev==1.mlnx.4.5.5142
sx-hash-calc==1.mlnx.4.5.5142
sx-scew==1.mlnx.4.5.5142
sx-scew-dev==1.mlnx.4.5.5142
sxd-libs==1.mlnx.4.5.5142
sxd-libs-dev==1.mlnx.4.5.5142
sx-acl-helper==1.mlnx.4.6.1020
sx-acl-helper-dev==1.mlnx.4.6.1020
sx-complib==1.mlnx.4.6.1020
sx-complib-dev==1.mlnx.4.6.1020
sx-examples==1.mlnx.4.6.1020
sx-examples-dev==1.mlnx.4.6.1020
sx-gen-utils==1.mlnx.4.6.1020
sx-gen-utils-dev==1.mlnx.4.6.1020
sx-hash-calc==1.mlnx.4.6.1020
sx-obj-desc-lib==1.mlnx.4.6.1020
sx-obj-desc-lib-dev==1.mlnx.4.6.1020
sxd-libs==1.mlnx.4.6.1020
sxd-libs-dev==1.mlnx.4.6.1020
syncd==1.0.0
syncd-vs==1.0.0
thrift-compiler==0.11.0-4
wjh-libs==1.mlnx.4.5.5142
wjh-libs-dev==1.mlnx.4.5.5142
thrift-compiler==0.14.1
wjh-libs==1.mlnx.4.6.1020
wjh-libs-dev==1.mlnx.4.6.1020
wpasupplicant==2:2.9.0-14
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
libnl-3-200==3.5.0-1
libnl-route-3-200==3.5.0-1
linux-headers-5.10.0-18-2-arm64==5.10.140-1
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ tabulate==0.8.2
thrift==0.14.1
toposort==1.6
wcwidth==0.2.6
websocket-client==1.6.1
websocket-client==1.6.2
www-authenticate==0.9.2
xmltodict==0.12.0

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ bcrypt==3.2.2
bitarray==1.5.3
click==7.0
requests==2.31.0
urllib3==2.0.4
zipp==1.2.0
24 changes: 12 additions & 12 deletions files/build/versions/default/versions-docker
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
amd64:amd64/debian:bullseye==sha256:3b6053ca925336c804e2d3f080af177efcdc9f51198a627569bfc7c7e730ef7e
amd64:amd64/debian:buster==sha256:5d6d56fd575caa578370f3d737116dc1aa3940c0e26f368ca36db72efa576570
amd64:debian:bullseye==sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0
amd64:debian:buster==sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616
arm64:arm64v8/debian:bullseye==sha256:de3c0d12dd75f1a47595ff0ce78f2d30d6ca95c3ad66af06c8815d1f9b8e208d
arm64:arm64v8/debian:buster==sha256:3b830c5d210077d297956550caedf93430d5779fd786b4ac8e22a6bfe54ff162
arm64:debian:bullseye==sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0
arm64:debian:buster==sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616
armhf:arm32v7/debian:bullseye==sha256:819b11bd0ade30fbc72f4b83593d0d126b2f3329b053495833219213fe37714d
armhf:arm32v7/debian:buster==sha256:d829b173cc834be382851eb0e3b6795fd6f3cbf1a47254409525d036de0dc0e7
armhf:debian:bullseye==sha256:a648e10e02af129706b1fb89e1ac9694ae3db7f2b8439aa906321e68cc281bc0
armhf:debian:buster==sha256:c21dbb23d41cb3f1c1a7f841e8642bf713934fb4dc5187979bd46f0b4b488616
amd64:amd64/debian:bullseye==sha256:7ac88cb3b95d347e89126a46696374fab97153b63d25995a5c6e75b5e98a0c79
amd64:amd64/debian:buster==sha256:287a6040d5af99b794cef7d10d7d12cddd31ec806db37b847a18e711f8333094
amd64:debian:bullseye==sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab
amd64:debian:buster==sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef
arm64:arm64v8/debian:bullseye==sha256:42336fd1e6984b68afbf5c44d2583e8eaba3b96ab4ecb89ac5f8cd9775f96f7f
arm64:arm64v8/debian:buster==sha256:ba5b1f163ce6ca7581997b8e23994ea1b86020ae9a336d342c05f66fba4d756a
arm64:debian:bullseye==sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab
arm64:debian:buster==sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef
armhf:arm32v7/debian:bullseye==sha256:4d1659dd8799a9c8e6f210a51cfbd198106a2d7cacc9bcc73af983328520cd8a
armhf:arm32v7/debian:buster==sha256:b7d5054fd4c48fec3e81019f3962d405b388c22eeee14d4d4c34fb43555f1418
armhf:debian:bullseye==sha256:1beb7cf458bdfe71b5220cb2069eb45e3fc7eb77a1ccfb169eaebf5f6c4809ab
armhf:debian:buster==sha256:b86bfc1dd2fb1820fea6c1e0b6e23d155198b518b3a506f6edad71bf6e9a8cef
20 changes: 10 additions & 10 deletions files/build/versions/default/versions-git
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
https://chromium.googlesource.com/chromium/tools/depot_tools.git==d411904b84c0d9f539bbdc84e3d63f9f282c658b
https://chromium.googlesource.com/chromium/tools/depot_tools.git==b8164180d2c339940c99db74344c865e67ca064d
https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f
https://github.com/CESNET/libyang.git==ea94c8b9f513f8a6ddc6ce1540fa41eaf4c8922a
https://github.com/CESNET/libyang.git==8b0b910a2dcb7360cb5b0aaefbd1338271d50946
https://github.com/daveolson53/audisp-tacplus.git==559c9f22edd4f2dea0ecedffb3ad9502b12a75b6
https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b
https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287
https://github.com/flashrom/flashrom.git==2b692d78c2ab8cb1ba68516cb4bd2ceae80d8936
https://github.com/FreeRADIUS/freeradius-server.git==1be5b1d181b5c51c34dc4b7f8e639082f80d6c87
https://github.com/FreeRADIUS/pam_radius.git==8d373539bb9f13b0abfe8bcae0095a930a00fad0
https://github.com/flashrom/flashrom.git==d534100c0503bc9ff47d95456ceabbe644929b5d
https://github.com/FreeRADIUS/freeradius-server.git==77b95a3f229355c722348fdbd9e623c51a24c65d
https://github.com/FreeRADIUS/pam_radius.git==7d75a319e43d5e234b93f89cd461a11861d07b95
https://github.com/jeroennijhof/pam_tacplus.git==4284d9016e64def2bb81d5f50f96dc3b59bfdc39
https://github.com/jpirko/libteam.git==7cb5de8b01be132bd4150eff460bfd83296414b6
https://github.com/lguohan/gnxi.git==b85e4ab565df4472fdcfcded2a53e6bf57aa493f
https://github.com/Marvell-switching/mrvl-prestera.git==179c08b0544db0b3a95a843e31266e00a68fb4b0
https://github.com/Marvell-switching/mrvl-prestera.git==63118c2a6b627e543f5556baa27eee1ec6cd7a2b
https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774
https://github.com/p4lang/ptf.git==d2e2d8ad005a451ad11f9d21af50079a0552921a
https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479
https://github.com/sflow/host-sflow==4dc68a95fa57758119d76e42965b32493ffd7094
https://github.com/sflow/sflowtool==4ce1223bb4c2cd0cbb1dd688dc0914561fcbb6c4
https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0
https://github.com/sflow/host-sflow==b9a0015e65f4e0274b9a4904f141867cf2f8ef97
https://github.com/sflow/sflowtool==219ab50bcfd9d9e714ff169eec31b2625933acb5
https://github.com/thom311/libnl==0f60ab3917dae704b6bc889b45a25e932f4cbc3a
https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d
https://salsa.debian.org/kernel-team/ethtool/==d0578651310379629399dde060577d4b9b0bcab1
https://salsa.debian.org/kernel-team/initramfs-tools.git==193dfbb7929e518976f89f6c8dd9201982e56f80
https://salsa.debian.org/kernel-team/initramfs-tools.git==cf964bfb4362019fd7fba1e839e403ff950dca8e
https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d
https://salsa.debian.org/ssh-team/openssh.git==d9a514f93f17d22766cfe760e25254ef13cb5eb1
Loading

0 comments on commit f150684

Please sign in to comment.