Skip to content

Commit 0526d17

Browse files
Junchao-MellanoxJunchao-Mellanox
authored
Merge branch 'master' into pmon-py3-build-support
2 parents 5e4aaac + 4257c79 commit 0526d17

File tree

177 files changed

+10854
-402
lines changed

Some content is hidden

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

177 files changed

+10854
-402
lines changed

‎Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ ifeq ($(NOSTRETCH), 0)
2525
make -f Makefile.work stretch
2626
endif
2727

28-
clean reset init configure showtag sonic-slave-build sonic-slave-bash :
28+
init:
29+
@echo "+++ Making $@ +++"
30+
make -f Makefile.work $@
31+
32+
clean configure reset showtag sonic-slave-build sonic-slave-bash :
2933
@echo "+++ Making $@ +++"
3034
ifeq ($(NOJESSIE), 0)
3135
make -f Makefile.work $@

‎build_debian.sh

-2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount
103103
## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
104104
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
105105
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
106-
sudo LANG=C chroot $FILESYSTEM_ROOT bash -c 'apt-mark auto `apt-mark showmanual`'
107106

108107
## Note: set lang to prevent locale warnings in your chroot
109108
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
@@ -517,7 +516,6 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y re
517516

518517
## Add mtd and uboot firmware tools package
519518
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install u-boot-tools mtd-utils device-tree-compiler
520-
sudo LANG=C chroot $FILESYSTEM_ROOT apt-mark manual u-boot-tools mtd-utils device-tree-compiler
521519

522520
## Update initramfs
523521
sudo chroot $FILESYSTEM_ROOT update-initramfs -u

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

+189
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
{
2+
"chassis": {
3+
"name": "DCS-7050QX-32",
4+
"components": [],
5+
"fans": [
6+
{
7+
"name": "fan1"
8+
},
9+
{
10+
"name": "fan2"
11+
},
12+
{
13+
"name": "fan3"
14+
},
15+
{
16+
"name": "fan4"
17+
}
18+
],
19+
"fan_drawers": [
20+
{
21+
"name": "fan1",
22+
"fans": [
23+
{
24+
"name": "fan1"
25+
}
26+
]
27+
},
28+
{
29+
"name": "fan2",
30+
"fans": [
31+
{
32+
"name": "fan2"
33+
}
34+
]
35+
},
36+
{
37+
"name": "fan3",
38+
"fans": [
39+
{
40+
"name": "fan3"
41+
}
42+
]
43+
},
44+
{
45+
"name": "fan4",
46+
"fans": [
47+
{
48+
"name": "fan4"
49+
}
50+
]
51+
}
52+
],
53+
"psus": [
54+
{
55+
"name": "psu1",
56+
"fans": []
57+
},
58+
{
59+
"name": "psu2",
60+
"fans": []
61+
}
62+
],
63+
"thermals": [
64+
{
65+
"name": "Cpu temp sensor"
66+
},
67+
{
68+
"name": "Board sensor"
69+
},
70+
{
71+
"name": "Front-panel temp sensor"
72+
},
73+
{
74+
"name": "Rear temp sensor"
75+
},
76+
{
77+
"name": "Power supply 1 inlet temp sensor"
78+
},
79+
{
80+
"name": "Power supply 1 internal sensor"
81+
},
82+
{
83+
"name": "Power supply 2 inlet temp sensor"
84+
},
85+
{
86+
"name": "Power supply 2 internal sensor"
87+
}
88+
],
89+
"sfps": [
90+
{
91+
"name": "qsfp1"
92+
},
93+
{
94+
"name": "qsfp2"
95+
},
96+
{
97+
"name": "qsfp3"
98+
},
99+
{
100+
"name": "qsfp4"
101+
},
102+
{
103+
"name": "qsfp5"
104+
},
105+
{
106+
"name": "qsfp6"
107+
},
108+
{
109+
"name": "qsfp7"
110+
},
111+
{
112+
"name": "qsfp8"
113+
},
114+
{
115+
"name": "qsfp9"
116+
},
117+
{
118+
"name": "qsfp10"
119+
},
120+
{
121+
"name": "qsfp11"
122+
},
123+
{
124+
"name": "qsfp12"
125+
},
126+
{
127+
"name": "qsfp13"
128+
},
129+
{
130+
"name": "qsfp14"
131+
},
132+
{
133+
"name": "qsfp15"
134+
},
135+
{
136+
"name": "qsfp16"
137+
},
138+
{
139+
"name": "qsfp17"
140+
},
141+
{
142+
"name": "qsfp18"
143+
},
144+
{
145+
"name": "qsfp19"
146+
},
147+
{
148+
"name": "qsfp20"
149+
},
150+
{
151+
"name": "qsfp21"
152+
},
153+
{
154+
"name": "qsfp22"
155+
},
156+
{
157+
"name": "qsfp23"
158+
},
159+
{
160+
"name": "qsfp24"
161+
},
162+
{
163+
"name": "qsfp25"
164+
},
165+
{
166+
"name": "qsfp26"
167+
},
168+
{
169+
"name": "qsfp27"
170+
},
171+
{
172+
"name": "qsfp28"
173+
},
174+
{
175+
"name": "qsfp29"
176+
},
177+
{
178+
"name": "qsfp30"
179+
},
180+
{
181+
"name": "qsfp31"
182+
},
183+
{
184+
"name": "qsfp32"
185+
}
186+
]
187+
},
188+
"interfaces": {}
189+
}

0 commit comments

Comments
 (0)