Skip to content

Commit 18d6b90

Browse files
slogan621slogan621
committed
Merge remote-tracking branch 'upstream/master'
2 parents 21af753 + 9905d93 commit 18d6b90

File tree

353 files changed

+6340
-1229
lines changed

Some content is hidden

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

353 files changed

+6340
-1229
lines changed

‎Makefile.cache

+2-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
# Run the 'touch cache.skip.common' command in the base directory to exclude the common files from caching
6969
SONIC_COMMON_FILES_LIST := $(if $(wildcard cache.skip.common),, .platform slave.mk rules/functions Makefile.cache)
7070
SONIC_COMMON_FLAGS_LIST := $(CONFIGURED_PLATFORM) \
71-
$(SONIC_DPKG_CACHE_SOURCE) $(SONIC_DEBUGGING_ON) \
71+
$(SONIC_DEBUGGING_ON) \
7272
$(SONIC_PROFILING_ON) $(SONIC_ENABLE_SYNCD_RPC)
7373
SONIC_COMMON_DPKG_LIST := debian/control debian/changelog debian/rules \
7474
debian/compat debian/install debian/copyright
@@ -249,9 +249,8 @@ define LOAD_FROM_CACHE
249249
$(if $(LOAD_DRV_DEB), $($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mxzvf $(CACHE_FILE_SELECT) 1>> $($(1)_DST_PATH)/$(1).log ,echo );
250250
echo "File $(CACHE_FILE_SELECT) is loaded from cache into $($(1)_BASE_PATH)" >> $($(1)_DST_PATH)/$(1).log
251251
$(eval $(1)_CACHE_LOADED := Yes)
252-
$(shell touch $(CACHE_FILE_SELECT))
252+
$(if $(call CHECK_WCACHE_ENABLED,$(1)), $(shell touch $(CACHE_FILE_SELECT)))
253253
echo "[ CACHE::LOADED ] $($(1)_CACHE_DIR)/$($(1)_MOD_CACHE_FILE)" >> $($(1)_DST_PATH)/$(1).log
254-
,
255254
echo "File $($(1)_CACHE_DIR)/$($(1)_MOD_CACHE_FILE) is not present in cache or cache mode set as $(SONIC_DPKG_CACHE_METHOD) !" >> $($(1)_DST_PATH)/$(1).log
256255
echo "[ CACHE::SKIPPED ] $($(1)_CACHE_DIR)/$($(1)_MOD_CACHE_FILE)" >> $($(1)_DST_PATH)/$(1).log
257256
echo "[ CACHE::SKIPPED ] DEP_FILES - Modified Files: [$($(1)_FILES_MODIFIED)] " >> $($(1)_DST_PATH)/$(1).log

‎build_debian.sh

+12-47
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [[ $CONFIGURED_ARCH == armhf || $CONFIGURED_ARCH == arm64 ]]; then
3737
else
3838
DOCKER_VERSION=5:18.09.8~3-0~debian-$IMAGE_DISTRO
3939
fi
40-
LINUX_KERNEL_VERSION=4.19.0-6-2
40+
LINUX_KERNEL_VERSION=4.19.0-9-2
4141

4242
## Working directory to prepare the file system
4343
FILESYSTEM_ROOT=./fsroot
@@ -389,61 +389,26 @@ rm /files/lib/systemd/system/rsyslog.service/Service/ExecStart/arguments
389389
set /files/lib/systemd/system/rsyslog.service/Service/ExecStart/arguments/1 -n
390390
"
391391

392-
## Config sysctl
393392
sudo mkdir -p $FILESYSTEM_ROOT/var/core
393+
394+
# Config sysctl
394395
sudo augtool --autosave "
395396
set /files/etc/sysctl.conf/kernel.core_pattern '|/usr/bin/coredump-compress %e %t %p'
396-
397397
set /files/etc/sysctl.conf/kernel.softlockup_panic 1
398398
set /files/etc/sysctl.conf/kernel.panic 10
399399
set /files/etc/sysctl.conf/vm.panic_on_oom 2
400400
set /files/etc/sysctl.conf/fs.suid_dumpable 2
401+
" -r $FILESYSTEM_ROOT
401402

402-
set /files/etc/sysctl.conf/net.ipv4.conf.default.forwarding 1
403-
set /files/etc/sysctl.conf/net.ipv4.conf.all.forwarding 1
404-
set /files/etc/sysctl.conf/net.ipv4.conf.eth0.forwarding 0
405-
406-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_accept 0
407-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_announce 0
408-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_filter 0
409-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_notify 0
410-
set /files/etc/sysctl.conf/net.ipv4.conf.default.arp_ignore 0
411-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_accept 0
412-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_announce 1
413-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_filter 0
414-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_notify 1
415-
set /files/etc/sysctl.conf/net.ipv4.conf.all.arp_ignore 2
416-
417-
set /files/etc/sysctl.conf/net.ipv4.neigh.default.base_reachable_time_ms 1800000
418-
set /files/etc/sysctl.conf/net.ipv6.neigh.default.base_reachable_time_ms 1800000
419-
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh1 1024
420-
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh1 1024
421-
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh2 2048
422-
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh2 2048
423-
set /files/etc/sysctl.conf/net.ipv4.neigh.default.gc_thresh3 4096
424-
set /files/etc/sysctl.conf/net.ipv6.neigh.default.gc_thresh3 4096
425-
426-
set /files/etc/sysctl.conf/net.ipv6.conf.default.forwarding 1
427-
set /files/etc/sysctl.conf/net.ipv6.conf.all.forwarding 1
428-
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.forwarding 0
429-
430-
set /files/etc/sysctl.conf/net.ipv6.conf.default.accept_dad 0
431-
set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0
432-
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_dad 0
433-
434-
set /files/etc/sysctl.conf/net.ipv6.conf.default.keep_addr_on_down 1
435-
set /files/etc/sysctl.conf/net.ipv6.conf.all.keep_addr_on_down 1
436-
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.keep_addr_on_down 1
437-
438-
set /files/etc/sysctl.conf/net.ipv4.tcp_l3mdev_accept 1
439-
set /files/etc/sysctl.conf/net.ipv4.udp_l3mdev_accept 1
440-
441-
set /files/etc/sysctl.conf/net.core.rmem_max 2097152
442-
set /files/etc/sysctl.conf/net.core.wmem_max 2097152
443-
444-
set /files/etc/sysctl.conf/net.core.somaxconn 512
403+
sysctl_net_cmd_string=""
404+
while read line; do
405+
[[ "$line" =~ ^#.*$ ]] && continue
406+
sysctl_net_conf_key=`echo $line | awk -F '=' '{print $1}'`
407+
sysctl_net_conf_value=`echo $line | awk -F '=' '{print $2}'`
408+
sysctl_net_cmd_string=$sysctl_net_cmd_string"set /files/etc/sysctl.conf/$sysctl_net_conf_key $sysctl_net_conf_value"$'\n'
409+
done < files/image_config/sysctl/sysctl-net.conf
445410

446-
" -r $FILESYSTEM_ROOT
411+
sudo augtool --autosave "$sysctl_net_cmd_string" -r $FILESYSTEM_ROOT
447412

448413
## docker Python API package is needed by Ansible docker module
449414
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip install 'docker==4.1.0'

‎device/accton/x86_64-accton_as7116_54x-r0/sonic_platform/sfp.py

+23-23
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def __init__(self, sfp_index, sfp_type):
195195
self.port_to_eeprom_mapping[p_num] = eeprom_path.format(
196196
self.port_to_i2c_mapping[p_num])
197197

198-
self.info_dict_keys = ['type', 'hardwarerev', 'serialnum', 'manufacturename', 'modelname', 'Connector', 'encoding', 'ext_identifier',
198+
self.info_dict_keys = ['type', 'hardware_rev', 'serial', 'manufacturer', 'model', 'connector', 'encoding', 'ext_identifier',
199199
'ext_rateselect_compliance', 'cable_type', 'cable_length', 'nominal_bit_rate', 'specification_compliance', 'vendor_date', 'vendor_oui']
200200

201201
self.dom_dict_keys = ['rx_los', 'tx_fault', 'reset_status', 'power_lpmode', 'tx_disable', 'tx_disable_channel', 'temperature', 'voltage',
@@ -308,11 +308,11 @@ def get_sfp_transceiver_info(self):
308308
keys |Value Format |Information
309309
---------------------------|---------------|----------------------------
310310
type |1*255VCHAR |type of SFP
311-
hardwarerev |1*255VCHAR |hardware version of SFP
312-
serialnum |1*255VCHAR |serial number of the SFP
313-
manufacturename |1*255VCHAR |SFP vendor name
314-
modelname |1*255VCHAR |SFP model name
315-
Connector |1*255VCHAR |connector information
311+
hardware_rev |1*255VCHAR |hardware version of SFP
312+
serial |1*255VCHAR |serial number of the SFP
313+
manufacturer |1*255VCHAR |SFP vendor name
314+
model |1*255VCHAR |SFP model name
315+
connector |1*255VCHAR |connector information
316316
encoding |1*255VCHAR |encoding information
317317
ext_identifier |1*255VCHAR |extend identifier
318318
ext_rateselect_compliance |1*255VCHAR |extended rateSelect compliance
@@ -371,17 +371,17 @@ def get_sfp_transceiver_info(self):
371371

372372
if sfp_interface_bulk_data:
373373
transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
374-
transceiver_info_dict['Connector'] = sfp_interface_bulk_data['data']['Connector']['value']
374+
transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
375375
transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
376376
transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
377377
transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
378378
transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value']
379379

380-
transceiver_info_dict['manufacturename'] = sfp_vendor_name_data[
380+
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
381381
'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
382-
transceiver_info_dict['modelname'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
383-
transceiver_info_dict['hardwarerev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
384-
transceiver_info_dict['serialnum'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
382+
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
383+
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
384+
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
385385
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
386386
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
387387
'data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
@@ -562,11 +562,11 @@ def get_qsfp_transceiver_info(self):
562562
keys |Value Format |Information
563563
---------------------------|---------------|----------------------------
564564
type |1*255VCHAR |type of SFP
565-
hardwarerev |1*255VCHAR |hardware version of SFP
566-
serialnum |1*255VCHAR |serial number of the SFP
567-
manufacturename |1*255VCHAR |SFP vendor name
568-
modelname |1*255VCHAR |SFP model name
569-
Connector |1*255VCHAR |connector information
565+
hardware_rev |1*255VCHAR |hardware version of SFP
566+
serial |1*255VCHAR |serial number of the SFP
567+
manufacturer |1*255VCHAR |SFP vendor name
568+
model |1*255VCHAR |SFP model name
569+
connector |1*255VCHAR |connector information
570570
encoding |1*255VCHAR |encoding information
571571
ext_identifier |1*255VCHAR |extend identifier
572572
ext_rateselect_compliance |1*255VCHAR |extended rateSelect compliance
@@ -625,17 +625,17 @@ def get_qsfp_transceiver_info(self):
625625

626626
if sfp_interface_bulk_data:
627627
transceiver_info_dict['type'] = sfp_interface_bulk_data['data']['type']['value']
628-
transceiver_info_dict['Connector'] = sfp_interface_bulk_data['data']['Connector']['value']
628+
transceiver_info_dict['connector'] = sfp_interface_bulk_data['data']['Connector']['value']
629629
transceiver_info_dict['encoding'] = sfp_interface_bulk_data['data']['EncodingCodes']['value']
630630
transceiver_info_dict['ext_identifier'] = sfp_interface_bulk_data['data']['Extended Identifier']['value']
631631
transceiver_info_dict['ext_rateselect_compliance'] = sfp_interface_bulk_data['data']['RateIdentifier']['value']
632632
transceiver_info_dict['type_abbrv_name'] = sfp_interface_bulk_data['data']['type_abbrv_name']['value']
633633

634-
transceiver_info_dict['manufacturename'] = sfp_vendor_name_data[
634+
transceiver_info_dict['manufacturer'] = sfp_vendor_name_data[
635635
'data']['Vendor Name']['value'] if sfp_vendor_name_data else 'N/A'
636-
transceiver_info_dict['modelname'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
637-
transceiver_info_dict['hardwarerev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
638-
transceiver_info_dict['serialnum'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
636+
transceiver_info_dict['model'] = sfp_vendor_pn_data['data']['Vendor PN']['value'] if sfp_vendor_pn_data else 'N/A'
637+
transceiver_info_dict['hardware_rev'] = sfp_vendor_rev_data['data']['Vendor Rev']['value'] if sfp_vendor_rev_data else 'N/A'
638+
transceiver_info_dict['serial'] = sfp_vendor_sn_data['data']['Vendor SN']['value'] if sfp_vendor_sn_data else 'N/A'
639639
transceiver_info_dict['vendor_oui'] = sfp_vendor_oui_data['data']['Vendor OUI']['value'] if sfp_vendor_oui_data else 'N/A'
640640
transceiver_info_dict['vendor_date'] = sfp_vendor_date_data[
641641
'data']['VendorDataCode(YYYY-MM-DD Lot)']['value'] if sfp_vendor_date_data else 'N/A'
@@ -1121,7 +1121,7 @@ def get_model(self):
11211121
string: Model/part number of device
11221122
"""
11231123
transceiver_dom_info_dict = self.get_transceiver_info()
1124-
return transceiver_dom_info_dict.get("modelname", "N/A")
1124+
return transceiver_dom_info_dict.get("model", "N/A")
11251125

11261126
def get_serial(self):
11271127
"""
@@ -1130,4 +1130,4 @@ def get_serial(self):
11301130
string: Serial number of device
11311131
"""
11321132
transceiver_dom_info_dict = self.get_transceiver_info()
1133-
return transceiver_dom_info_dict.get("serialnum", "N/A")
1133+
return transceiver_dom_info_dict.get("serial", "N/A")

‎device/arista/x86_64-arista_7050_qx32/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7050_qx32s/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7050cx3_32s/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7060_cx32s/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7060cx2_32s/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7060px4_32/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7170_32c/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7170_32cd/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7170_64c/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7260cx3_64/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_7280cr3_32p4/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

‎device/arista/x86_64-arista_common/pmon_daemon_control_skip_thermalctld.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"skip_thermalctld": true
3+
}
4+

‎device/celestica/x86_64-cel_e1031-r0/plugins/pcie.yaml

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
- bus: '00'
2+
dev: '00'
3+
fn: '0'
4+
id: 1f0f
5+
name: 'Host bridge: Intel Corporation Atom processor C2000 SoC Transaction Router'
6+
- bus: '00'
7+
dev: '01'
8+
fn: '0'
9+
id: 1f10
10+
name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 1'
11+
- bus: '00'
12+
dev: '02'
13+
fn: '0'
14+
id: 1f11
15+
name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 2'
16+
- bus: '00'
17+
dev: '03'
18+
fn: '0'
19+
id: 1f12
20+
name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 3'
21+
- bus: '00'
22+
dev: '04'
23+
fn: '0'
24+
id: 1f13
25+
name: 'PCI bridge: Intel Corporation Atom processor C2000 PCIe Root Port 4'
26+
- bus: '00'
27+
dev: 0e
28+
fn: '0'
29+
id: 1f14
30+
name: 'Host bridge: Intel Corporation Atom processor C2000 RAS'
31+
- bus: '00'
32+
dev: 0f
33+
fn: '0'
34+
id: 1f16
35+
name: 'IOMMU: Intel Corporation Atom processor C2000 RCEC'
36+
- bus: '00'
37+
dev: '13'
38+
fn: '0'
39+
id: 1f15
40+
name: 'System peripheral: Intel Corporation Atom processor C2000 SMBus 2.0'
41+
- bus: '00'
42+
dev: '14'
43+
fn: '0'
44+
id: 1f41
45+
name: 'Ethernet controller: Intel Corporation Ethernet Connection I354'
46+
- bus: '00'
47+
dev: '16'
48+
fn: '0'
49+
id: 1f2c
50+
name: 'USB controller: Intel Corporation Atom processor C2000 USB Enhanced Host Controller'
51+
- bus: '00'
52+
dev: '17'
53+
fn: '0'
54+
id: 1f22
55+
name: 'SATA controller: Intel Corporation Atom processor C2000 AHCI SATA2 Controller'
56+
- bus: '00'
57+
dev: 1f
58+
fn: '0'
59+
id: 1f38
60+
name: 'ISA bridge: Intel Corporation Atom processor C2000 PCU'
61+
- bus: '00'
62+
dev: 1f
63+
fn: '3'
64+
id: 1f3c
65+
name: 'SMBus: Intel Corporation Atom processor C2000 PCU SMBus'
66+
- bus: '01'
67+
dev: '00'
68+
fn: '0'
69+
id: b340
70+
name: 'Ethernet controller: Broadcom Limited Device b340'
71+
- bus: '01'
72+
dev: '00'
73+
fn: '1'
74+
id: b340
75+
name: 'Ethernet controller: Broadcom Limited Device b340'
76+

0 commit comments

Comments
 (0)