Skip to content

Commit 6f09dea

Browse files
abdosiabdosi
committed
Merge remote-tracking branch 'upsteam/master'
2 parents 2eb13c6 + 649e6c7 commit 6f09dea

File tree

187 files changed

+5068
-2665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+5068
-2665
lines changed

‎.azure-pipelines/azure-pipelines-UpgrateVersion.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ schedules:
1111
displayName: Daily Build
1212
branches:
1313
include:
14-
- 20????
14+
- 20*
1515
exclude:
16-
- 200???
17-
- 201???
16+
- 200*
17+
- 201*
1818
- 202006
1919
always: true
2020

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# a pull request.
1111
* @lguohan
1212

13-
/device/ @jleveque
13+
/device/ @sujinmkang @prgeor @vdahiya12
1414

1515
# build
1616
/rules/ @qiluo-msft @xumia @lguohan

‎build_debian.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
320320
python-is-python3 \
321321
cron \
322322
libprotobuf23 \
323-
libgrpc++ \
323+
libgrpc++1 \
324+
libgrpc10 \
324325
haveged \
325326
fdisk \
326327
gpg \
@@ -585,7 +586,7 @@ sudo rm -f $ONIE_INSTALLER_PAYLOAD $FILESYSTEM_SQUASHFS
585586
sudo du -hsx $FILESYSTEM_ROOT
586587
sudo mkdir -p $FILESYSTEM_ROOT/var/lib/docker
587588
scripts/collect_host_image_version_files.sh $TARGET_PATH $FILESYSTEM_ROOT
588-
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -e boot -e var/lib/docker -e $PLATFORM_DIR
589+
sudo mksquashfs $FILESYSTEM_ROOT $FILESYSTEM_SQUASHFS -comp zstd -b 1M -e boot -e var/lib/docker -e $PLATFORM_DIR
589590

590591
# Ensure admin gid is 1000
591592
gid_user=$(sudo LANG=C chroot $FILESYSTEM_ROOT id -g $USERNAME) || gid_user="none"

‎device/accton/x86_64-accton_as7326_56x-r0/pddf/pddf-device.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
[
3333
"i2c-i801",
3434
"i2c_dev",
35-
"i2c_mux_pca954x force_deselect_on_exit=1",
35+
"i2c_mux_pca954x",
3636
"optoe"
3737
],
3838
"pddf_kos":

‎device/accton/x86_64-accton_as7726_32x-r0/pddf/pddf-device.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[
3434
"i2c-i801",
3535
"i2c_dev",
36-
"i2c_mux_pca954x force_deselect_on_exit=1",
36+
"i2c_mux_pca954x",
3737
"optoe"
3838
],
3939
"pddf_kos":

‎device/accton/x86_64-accton_as7816_64x-r0/pddf/pddf-device.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
[
3333
"i2c-i801",
3434
"i2c_dev",
35-
"i2c_mux_pca954x force_deselect_on_exit=1",
35+
"i2c_mux_pca954x",
3636
"optoe"
3737
],
3838
"pddf_kos":

‎device/accton/x86_64-accton_as9716_32d-r0/pddf/pddf-device.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"i2c-ismt",
3434
"i2c-i801",
3535
"i2c_dev",
36-
"i2c_mux_pca954x force_deselect_on_exit=1",
36+
"i2c_mux_pca954x",
3737
"optoe"
3838
],
3939
"pddf_kos":

‎device/dell/x86_64-dell_s6000_s1220-r0/platform.json

+92-10
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,59 @@
2525
"speed": {
2626
"controllable": true,
2727
"minimum": 40
28+
},
29+
"status_led": {
30+
"available": false
2831
}
2932
},
3033
{
3134
"name": "FanTray1-Fan2",
3235
"speed": {
3336
"controllable": true,
3437
"minimum": 40
38+
},
39+
"status_led": {
40+
"available": false
3541
}
3642
},
3743
{
3844
"name": "FanTray2-Fan1",
3945
"speed": {
4046
"controllable": true,
4147
"minimum": 40
48+
},
49+
"status_led": {
50+
"available": false
4251
}
4352
},
4453
{
4554
"name": "FanTray2-Fan2",
4655
"speed": {
4756
"controllable": true,
4857
"minimum": 40
58+
},
59+
"status_led": {
60+
"available": false
4961
}
5062
},
5163
{
5264
"name": "FanTray3-Fan1",
5365
"speed": {
5466
"controllable": true,
5567
"minimum": 40
68+
},
69+
"status_led": {
70+
"available": false
5671
}
5772
},
5873
{
5974
"name": "FanTray3-Fan2",
6075
"speed": {
6176
"controllable": true,
6277
"minimum": 40
78+
},
79+
"status_led": {
80+
"available": false
6381
}
6482
}
6583
],
@@ -76,13 +94,19 @@
7694
"speed": {
7795
"controllable": true,
7896
"minimum": 40
97+
},
98+
"status_led": {
99+
"available": false
79100
}
80101
},
81102
{
82103
"name": "FanTray1-Fan2",
83104
"speed": {
84105
"controllable": true,
85106
"minimum": 40
107+
},
108+
"status_led": {
109+
"available": false
86110
}
87111
}
88112
]
@@ -99,13 +123,19 @@
99123
"speed": {
100124
"controllable": true,
101125
"minimum": 40
126+
},
127+
"status_led": {
128+
"available": false
102129
}
103130
},
104131
{
105132
"name": "FanTray2-Fan2",
106133
"speed": {
107134
"controllable": true,
108135
"minimum": 40
136+
},
137+
"status_led": {
138+
"available": false
109139
}
110140
}
111141
]
@@ -122,13 +152,19 @@
122152
"speed": {
123153
"controllable": true,
124154
"minimum": 40
155+
},
156+
"status_led": {
157+
"available": false
125158
}
126159
},
127160
{
128161
"name": "FanTray3-Fan2",
129162
"speed": {
130163
"controllable": true,
131164
"minimum": 40
165+
},
166+
"status_led": {
167+
"available": false
132168
}
133169
}
134170
]
@@ -146,17 +182,28 @@
146182
"speed": {
147183
"controllable": true,
148184
"minimum": 40
185+
},
186+
"status_led": {
187+
"available": false
149188
}
150189
}
151190
],
152191
"thermals": [
153192
{
154193
"name": "PSU1-Sensor 1",
155-
"controllable": false
194+
"controllable": false,
195+
"low-crit-threshold": false,
196+
"high-crit-threshold": false,
197+
"minimum-recorded": false,
198+
"maximum-recorded": false
156199
},
157200
{
158201
"name": "PSU1-Sensor 2",
159-
"controllable": false
202+
"controllable": false,
203+
"low-crit-threshold": false,
204+
"high-crit-threshold": false,
205+
"minimum-recorded": false,
206+
"maximum-recorded": false
160207
}
161208
]
162209
},
@@ -171,45 +218,80 @@
171218
"speed": {
172219
"controllable": true,
173220
"minimum": 40
221+
},
222+
"status_led": {
223+
"available": false
174224
}
175225
}
176226
],
177227
"thermals": [
178228
{
179229
"name": "PSU2-Sensor 1",
180-
"controllable": false
230+
"controllable": false,
231+
"low-crit-threshold": false,
232+
"high-crit-threshold": false,
233+
"minimum-recorded": false,
234+
"maximum-recorded": false
181235
},
182236
{
183237
"name": "PSU2-Sensor 2",
184-
"controllable": false
238+
"controllable": false,
239+
"low-crit-threshold": false,
240+
"high-crit-threshold": false,
241+
"minimum-recorded": false,
242+
"maximum-recorded": false
185243
}
186244
]
187245
}
188246
],
189247
"thermals": [
190248
{
191249
"name": "ASIC On-board",
192-
"controllable": false
250+
"controllable": false,
251+
"low-crit-threshold": false,
252+
"high-crit-threshold": false,
253+
"minimum-recorded": false,
254+
"maximum-recorded": false
193255
},
194256
{
195257
"name": "NIC",
196-
"controllable": false
258+
"controllable": false,
259+
"low-crit-threshold": false,
260+
"high-crit-threshold": false,
261+
"minimum-recorded": false,
262+
"maximum-recorded": false
197263
},
198264
{
199265
"name": "System Front",
200-
"controllable": false
266+
"controllable": false,
267+
"low-crit-threshold": false,
268+
"high-crit-threshold": false,
269+
"minimum-recorded": false,
270+
"maximum-recorded": false
201271
},
202272
{
203273
"name": "DIMM",
204-
"controllable": false
274+
"controllable": false,
275+
"low-crit-threshold": false,
276+
"high-crit-threshold": false,
277+
"minimum-recorded": false,
278+
"maximum-recorded": false
205279
},
206280
{
207281
"name": "CPU Core 0",
208-
"controllable": false
282+
"controllable": false,
283+
"low-crit-threshold": false,
284+
"high-crit-threshold": false,
285+
"minimum-recorded": false,
286+
"maximum-recorded": false
209287
},
210288
{
211289
"name": "CPU Core 1",
212-
"controllable": false
290+
"controllable": false,
291+
"low-crit-threshold": false,
292+
"high-crit-threshold": false,
293+
"minimum-recorded": false,
294+
"maximum-recorded": false
213295
}
214296
],
215297
"modules": [],

0 commit comments

Comments
 (0)