Skip to content

Commit d721996

Browse files
authored
Keep eth1 for multi-asic disaggregated chassis platforms (sonic-net#24298)
Keep eth1 for multi-asic disaggregated chassis platforms
1 parent 564e460 commit d721996

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

src/sonic-device-data/Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
5252
num_columns=$$(echo $$last_line | awk '{print NF}'); \
5353
i=0; \
5454
if [ -f $$(dirname $$d)/chassisdb.conf ] && ! grep -q '^disaggregated_chassis=1' $$(dirname $$d)/platform_env.conf; then \
55+
echo "Reserve midplane interface for $$(dirname $$d)"; \
5556
i=$$(($$i+1)); \
5657
fi; \
57-
while IFS= read -r line; do \
58+
while IFS= read -r line || [ -n "$$line" ]; do \
5859
if ! grep -q "^#" <<< "$$line"; then \
5960
i=$$(($$i+1)); \
6061
lanes=$$(echo "$$line" | awk '{print $$2}'); \
@@ -70,7 +71,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
7071
if [ -f device/x86_64-kvm_x86_64-r0/$$(basename $$d)/context_config.json ]; then \
7172
rm device/x86_64-kvm_x86_64-r0/$$(basename $$d)/context_config.json; \
7273
fi; \
73-
i=0; \
7474
if [ -f $$(dirname $$d)/chassisdb.conf ]; then \
7575
# Append Cpu0 Port in lanemap.ini
7676
if [ -f device/x86_64-kvm_x86_64-r0/$$(basename $$d)/lanemap.ini ]; then \
@@ -79,6 +79,10 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
7979
if [ -f device/x86_64-kvm_x86_64-r0/$$(basename $$d)/coreportindexmap.ini ]; then \
8080
echo "Cpu0:0,0" >> device/x86_64-kvm_x86_64-r0/$$(basename $$d)/coreportindexmap.ini; \
8181
fi; \
82+
fi; \
83+
i=0; \
84+
if [ -f $$(dirname $$d)/chassisdb.conf ] && ! grep -q '^disaggregated_chassis=1' $$(dirname $$d)/platform_env.conf; then \
85+
echo "Reserve midplane interface for $$(dirname $$d)"; \
8286
i=$$(($$i+1)); \
8387
fi; \
8488
subdirs="0 1 2"; \
@@ -93,7 +97,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
9397
if [ -f device/x86_64-kvm_x86_64-r0/$$(basename $$d)/$$(basename $$subdir)/port_config.ini ]; then \
9498
last_line=$$(tail -n 1 device/x86_64-kvm_x86_64-r0/$$(basename $$d)/$$(basename $$subdir)/port_config.ini); \
9599
num_columns=$$(echo $$last_line | awk '{print NF}'); \
96-
while IFS= read -r line; do \
100+
while IFS= read -r line || [ -n "$$line" ]; do \
97101
if ! grep -q "^#" <<< "$$line"; then \
98102
i=$$(($$i+1)); \
99103
lanes=$$(echo "$$line" | awk '{print $$2}'); \

0 commit comments

Comments
 (0)