diff --git a/Makefile.cache b/Makefile.cache index 2d9858d44a84..909f32910760 100644 --- a/Makefile.cache +++ b/Makefile.cache @@ -295,10 +295,12 @@ define SAVE_INTO_CACHE echo "Target $(1) dependencies are modifed - global save cache skipped" >> $($(1)_DST_PATH)/$(1).log $(eval $(1)_CACHE_DIR := $(SONIC_DPKG_LOCAL_CACHE_DIR)) ) - $($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) ) \ + cp $($(1)_DST_PATH)/$(1).log $($(1)_DST_PATH)/$(1).cached.log + $($(1)_CACHE_USER) tar -C $($(1)_BASE_PATH) -mczvf $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) $(2) $(addprefix $($(1)_DST_PATH)/,$($(1)_DERIVED_DEBS) $($(1)_EXTRA_DEBS) $(1).cached.log) \ 1>>$($(1)_DST_PATH)/$(1).log sudo chmod 777 $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) - + rm -f $($(1)_DST_PATH)/$(1).cached.log + echo "File $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE) saved in cache " >> $($(1)_DST_PATH)/$(1).log echo "[ CACHE::SAVED ] $($(1)_CACHE_DIR)/$(MOD_CACHE_FILE)" >> $($(1)_DST_PATH)/$(1).log diff --git a/build_debian.sh b/build_debian.sh index b9dfd47bb5a4..4b0504b40b52 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -393,8 +393,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in python-is-python3 \ cron \ libprotobuf32 \ - libgrpc++1 \ libgrpc29 \ + libgrpc++1.51 \ haveged \ fdisk \ gpg \ diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm index cc7d79bc2a88..5ece4f833fc4 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm @@ -453,17 +453,17 @@ fabric_connect_mode=FE fabric_logical_port_base=512 # Fabric lane mapping -lane_to_serdes_map_fabric_lane0=rx0:tx0 +lane_to_serdes_map_fabric_lane0=rx0:tx3 lane_to_serdes_map_fabric_lane1=rx1:tx1 lane_to_serdes_map_fabric_lane2=rx2:tx2 -lane_to_serdes_map_fabric_lane3=rx3:tx3 +lane_to_serdes_map_fabric_lane3=rx3:tx0 lane_to_serdes_map_fabric_lane4=rx4:tx4 lane_to_serdes_map_fabric_lane5=rx5:tx5 lane_to_serdes_map_fabric_lane6=rx6:tx6 lane_to_serdes_map_fabric_lane7=rx7:tx7 -lane_to_serdes_map_fabric_lane8=rx8:tx10 +lane_to_serdes_map_fabric_lane8=rx8:tx9 lane_to_serdes_map_fabric_lane9=rx9:tx11 -lane_to_serdes_map_fabric_lane10=rx10:tx9 +lane_to_serdes_map_fabric_lane10=rx10:tx10 lane_to_serdes_map_fabric_lane11=rx11:tx8 lane_to_serdes_map_fabric_lane12=rx12:tx12 lane_to_serdes_map_fabric_lane13=rx13:tx15 @@ -475,15 +475,15 @@ lane_to_serdes_map_fabric_lane18=rx18:tx16 lane_to_serdes_map_fabric_lane19=rx19:tx19 lane_to_serdes_map_fabric_lane20=rx20:tx21 lane_to_serdes_map_fabric_lane21=rx21:tx23 -lane_to_serdes_map_fabric_lane22=rx22:tx20 -lane_to_serdes_map_fabric_lane23=rx23:tx22 -lane_to_serdes_map_fabric_lane24=rx24:tx26 +lane_to_serdes_map_fabric_lane22=rx22:tx22 +lane_to_serdes_map_fabric_lane23=rx23:tx20 +lane_to_serdes_map_fabric_lane24=rx24:tx25 lane_to_serdes_map_fabric_lane25=rx25:tx24 -lane_to_serdes_map_fabric_lane26=rx26:tx25 -lane_to_serdes_map_fabric_lane27=rx27:tx27 +lane_to_serdes_map_fabric_lane26=rx26:tx27 +lane_to_serdes_map_fabric_lane27=rx27:tx26 lane_to_serdes_map_fabric_lane28=rx28:tx31 -lane_to_serdes_map_fabric_lane29=rx29:tx30 -lane_to_serdes_map_fabric_lane30=rx30:tx29 +lane_to_serdes_map_fabric_lane29=rx29:tx29 +lane_to_serdes_map_fabric_lane30=rx30:tx30 lane_to_serdes_map_fabric_lane31=rx31:tx28 lane_to_serdes_map_fabric_lane32=rx32:tx32 lane_to_serdes_map_fabric_lane33=rx33:tx33 @@ -522,17 +522,17 @@ lane_to_serdes_map_fabric_lane65=rx65:tx65 lane_to_serdes_map_fabric_lane66=rx66:tx66 lane_to_serdes_map_fabric_lane67=rx67:tx67 lane_to_serdes_map_fabric_lane68=rx68:tx68 -lane_to_serdes_map_fabric_lane69=rx69:tx69 -lane_to_serdes_map_fabric_lane70=rx70:tx70 -lane_to_serdes_map_fabric_lane71=rx71:tx71 +lane_to_serdes_map_fabric_lane69=rx69:tx70 +lane_to_serdes_map_fabric_lane70=rx70:tx71 +lane_to_serdes_map_fabric_lane71=rx71:tx69 lane_to_serdes_map_fabric_lane72=rx72:tx75 lane_to_serdes_map_fabric_lane73=rx73:tx74 lane_to_serdes_map_fabric_lane74=rx74:tx73 lane_to_serdes_map_fabric_lane75=rx75:tx72 -lane_to_serdes_map_fabric_lane76=rx76:tx79 +lane_to_serdes_map_fabric_lane76=rx76:tx76 lane_to_serdes_map_fabric_lane77=rx77:tx78 lane_to_serdes_map_fabric_lane78=rx78:tx77 -lane_to_serdes_map_fabric_lane79=rx79:tx76 +lane_to_serdes_map_fabric_lane79=rx79:tx79 lane_to_serdes_map_fabric_lane80=rx80:tx80 lane_to_serdes_map_fabric_lane81=rx81:tx81 lane_to_serdes_map_fabric_lane82=rx82:tx83 @@ -543,11 +543,11 @@ lane_to_serdes_map_fabric_lane86=rx86:tx84 lane_to_serdes_map_fabric_lane87=rx87:tx87 lane_to_serdes_map_fabric_lane88=rx88:tx90 lane_to_serdes_map_fabric_lane89=rx89:tx88 -lane_to_serdes_map_fabric_lane90=rx90:tx91 -lane_to_serdes_map_fabric_lane91=rx91:tx89 +lane_to_serdes_map_fabric_lane90=rx90:tx89 +lane_to_serdes_map_fabric_lane91=rx91:tx91 lane_to_serdes_map_fabric_lane92=rx92:tx93 -lane_to_serdes_map_fabric_lane93=rx93:tx92 -lane_to_serdes_map_fabric_lane94=rx94:tx94 +lane_to_serdes_map_fabric_lane93=rx93:tx94 +lane_to_serdes_map_fabric_lane94=rx94:tx92 lane_to_serdes_map_fabric_lane95=rx95:tx95 lane_to_serdes_map_fabric_lane96=rx96:tx96 lane_to_serdes_map_fabric_lane97=rx97:tx97 @@ -557,30 +557,30 @@ lane_to_serdes_map_fabric_lane100=rx100:tx100 lane_to_serdes_map_fabric_lane101=rx101:tx101 lane_to_serdes_map_fabric_lane102=rx102:tx102 lane_to_serdes_map_fabric_lane103=rx103:tx103 -lane_to_serdes_map_fabric_lane104=rx104:tx105 -lane_to_serdes_map_fabric_lane105=rx105:tx106 -lane_to_serdes_map_fabric_lane106=rx106:tx107 -lane_to_serdes_map_fabric_lane107=rx107:tx104 -lane_to_serdes_map_fabric_lane108=rx108:tx111 +lane_to_serdes_map_fabric_lane104=rx104:tx104 +lane_to_serdes_map_fabric_lane105=rx105:tx107 +lane_to_serdes_map_fabric_lane106=rx106:tx106 +lane_to_serdes_map_fabric_lane107=rx107:tx105 +lane_to_serdes_map_fabric_lane108=rx108:tx108 lane_to_serdes_map_fabric_lane109=rx109:tx109 lane_to_serdes_map_fabric_lane110=rx110:tx110 -lane_to_serdes_map_fabric_lane111=rx111:tx108 -lane_to_serdes_map_fabric_lane112=rx112:tx114 -lane_to_serdes_map_fabric_lane113=rx113:tx113 +lane_to_serdes_map_fabric_lane111=rx111:tx111 +lane_to_serdes_map_fabric_lane112=rx112:tx115 +lane_to_serdes_map_fabric_lane113=rx113:tx114 lane_to_serdes_map_fabric_lane114=rx114:tx112 -lane_to_serdes_map_fabric_lane115=rx115:tx115 -lane_to_serdes_map_fabric_lane116=rx116:tx117 -lane_to_serdes_map_fabric_lane117=rx117:tx116 -lane_to_serdes_map_fabric_lane118=rx118:tx119 -lane_to_serdes_map_fabric_lane119=rx119:tx118 -lane_to_serdes_map_fabric_lane120=rx120:tx123 -lane_to_serdes_map_fabric_lane121=rx121:tx120 -lane_to_serdes_map_fabric_lane122=rx122:tx122 -lane_to_serdes_map_fabric_lane123=rx123:tx121 -lane_to_serdes_map_fabric_lane124=rx124:tx127 -lane_to_serdes_map_fabric_lane125=rx125:tx125 -lane_to_serdes_map_fabric_lane126=rx126:tx124 -lane_to_serdes_map_fabric_lane127=rx127:tx126 +lane_to_serdes_map_fabric_lane115=rx115:tx113 +lane_to_serdes_map_fabric_lane116=rx116:tx118 +lane_to_serdes_map_fabric_lane117=rx117:tx119 +lane_to_serdes_map_fabric_lane118=rx118:tx116 +lane_to_serdes_map_fabric_lane119=rx119:tx117 +lane_to_serdes_map_fabric_lane120=rx120:tx121 +lane_to_serdes_map_fabric_lane121=rx121:tx122 +lane_to_serdes_map_fabric_lane122=rx122:tx120 +lane_to_serdes_map_fabric_lane123=rx123:tx123 +lane_to_serdes_map_fabric_lane124=rx124:tx124 +lane_to_serdes_map_fabric_lane125=rx125:tx127 +lane_to_serdes_map_fabric_lane126=rx126:tx126 +lane_to_serdes_map_fabric_lane127=rx127:tx125 lane_to_serdes_map_fabric_lane128=rx128:tx128 lane_to_serdes_map_fabric_lane129=rx129:tx129 lane_to_serdes_map_fabric_lane130=rx130:tx130 @@ -593,12 +593,12 @@ lane_to_serdes_map_fabric_lane136=rx136:tx139 lane_to_serdes_map_fabric_lane137=rx137:tx138 lane_to_serdes_map_fabric_lane138=rx138:tx137 lane_to_serdes_map_fabric_lane139=rx139:tx136 -lane_to_serdes_map_fabric_lane140=rx140:tx140 +lane_to_serdes_map_fabric_lane140=rx140:tx143 lane_to_serdes_map_fabric_lane141=rx141:tx142 lane_to_serdes_map_fabric_lane142=rx142:tx141 -lane_to_serdes_map_fabric_lane143=rx143:tx143 -lane_to_serdes_map_fabric_lane144=rx144:tx144 -lane_to_serdes_map_fabric_lane145=rx145:tx145 +lane_to_serdes_map_fabric_lane143=rx143:tx140 +lane_to_serdes_map_fabric_lane144=rx144:tx145 +lane_to_serdes_map_fabric_lane145=rx145:tx144 lane_to_serdes_map_fabric_lane146=rx146:tx146 lane_to_serdes_map_fabric_lane147=rx147:tx147 lane_to_serdes_map_fabric_lane148=rx148:tx148 @@ -614,8 +614,8 @@ lane_to_serdes_map_fabric_lane157=rx157:tx158 lane_to_serdes_map_fabric_lane158=rx158:tx157 lane_to_serdes_map_fabric_lane159=rx159:tx156 lane_to_serdes_map_fabric_lane160=rx160:tx160 -lane_to_serdes_map_fabric_lane161=rx161:tx161 -lane_to_serdes_map_fabric_lane162=rx162:tx162 +lane_to_serdes_map_fabric_lane161=rx161:tx162 +lane_to_serdes_map_fabric_lane162=rx162:tx161 lane_to_serdes_map_fabric_lane163=rx163:tx163 lane_to_serdes_map_fabric_lane164=rx164:tx164 lane_to_serdes_map_fabric_lane165=rx165:tx165 @@ -639,11 +639,11 @@ lane_to_serdes_map_fabric_lane182=rx182:tx180 lane_to_serdes_map_fabric_lane183=rx183:tx183 lane_to_serdes_map_fabric_lane184=rx184:tx186 lane_to_serdes_map_fabric_lane185=rx185:tx184 -lane_to_serdes_map_fabric_lane186=rx186:tx185 -lane_to_serdes_map_fabric_lane187=rx187:tx187 -lane_to_serdes_map_fabric_lane188=rx188:tx188 +lane_to_serdes_map_fabric_lane186=rx186:tx187 +lane_to_serdes_map_fabric_lane187=rx187:tx185 +lane_to_serdes_map_fabric_lane188=rx188:tx190 lane_to_serdes_map_fabric_lane189=rx189:tx189 -lane_to_serdes_map_fabric_lane190=rx190:tx190 +lane_to_serdes_map_fabric_lane190=rx190:tx188 lane_to_serdes_map_fabric_lane191=rx191:tx191 # diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm index 97a58f37acda..ed7d23113add 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm @@ -471,17 +471,17 @@ fabric_connect_mode=FE fabric_logical_port_base=512 # Fabric lane mapping -lane_to_serdes_map_fabric_lane0=rx0:tx0 +lane_to_serdes_map_fabric_lane0=rx0:tx3 lane_to_serdes_map_fabric_lane1=rx1:tx1 lane_to_serdes_map_fabric_lane2=rx2:tx2 -lane_to_serdes_map_fabric_lane3=rx3:tx3 +lane_to_serdes_map_fabric_lane3=rx3:tx0 lane_to_serdes_map_fabric_lane4=rx4:tx4 lane_to_serdes_map_fabric_lane5=rx5:tx5 lane_to_serdes_map_fabric_lane6=rx6:tx6 lane_to_serdes_map_fabric_lane7=rx7:tx7 -lane_to_serdes_map_fabric_lane8=rx8:tx10 +lane_to_serdes_map_fabric_lane8=rx8:tx9 lane_to_serdes_map_fabric_lane9=rx9:tx11 -lane_to_serdes_map_fabric_lane10=rx10:tx9 +lane_to_serdes_map_fabric_lane10=rx10:tx10 lane_to_serdes_map_fabric_lane11=rx11:tx8 lane_to_serdes_map_fabric_lane12=rx12:tx12 lane_to_serdes_map_fabric_lane13=rx13:tx15 @@ -493,15 +493,15 @@ lane_to_serdes_map_fabric_lane18=rx18:tx16 lane_to_serdes_map_fabric_lane19=rx19:tx19 lane_to_serdes_map_fabric_lane20=rx20:tx21 lane_to_serdes_map_fabric_lane21=rx21:tx23 -lane_to_serdes_map_fabric_lane22=rx22:tx20 -lane_to_serdes_map_fabric_lane23=rx23:tx22 -lane_to_serdes_map_fabric_lane24=rx24:tx26 +lane_to_serdes_map_fabric_lane22=rx22:tx22 +lane_to_serdes_map_fabric_lane23=rx23:tx20 +lane_to_serdes_map_fabric_lane24=rx24:tx25 lane_to_serdes_map_fabric_lane25=rx25:tx24 -lane_to_serdes_map_fabric_lane26=rx26:tx25 -lane_to_serdes_map_fabric_lane27=rx27:tx27 +lane_to_serdes_map_fabric_lane26=rx26:tx27 +lane_to_serdes_map_fabric_lane27=rx27:tx26 lane_to_serdes_map_fabric_lane28=rx28:tx31 -lane_to_serdes_map_fabric_lane29=rx29:tx30 -lane_to_serdes_map_fabric_lane30=rx30:tx29 +lane_to_serdes_map_fabric_lane29=rx29:tx29 +lane_to_serdes_map_fabric_lane30=rx30:tx30 lane_to_serdes_map_fabric_lane31=rx31:tx28 lane_to_serdes_map_fabric_lane32=rx32:tx32 lane_to_serdes_map_fabric_lane33=rx33:tx33 @@ -540,17 +540,17 @@ lane_to_serdes_map_fabric_lane65=rx65:tx65 lane_to_serdes_map_fabric_lane66=rx66:tx66 lane_to_serdes_map_fabric_lane67=rx67:tx67 lane_to_serdes_map_fabric_lane68=rx68:tx68 -lane_to_serdes_map_fabric_lane69=rx69:tx69 -lane_to_serdes_map_fabric_lane70=rx70:tx70 -lane_to_serdes_map_fabric_lane71=rx71:tx71 +lane_to_serdes_map_fabric_lane69=rx69:tx70 +lane_to_serdes_map_fabric_lane70=rx70:tx71 +lane_to_serdes_map_fabric_lane71=rx71:tx69 lane_to_serdes_map_fabric_lane72=rx72:tx75 lane_to_serdes_map_fabric_lane73=rx73:tx74 lane_to_serdes_map_fabric_lane74=rx74:tx73 lane_to_serdes_map_fabric_lane75=rx75:tx72 -lane_to_serdes_map_fabric_lane76=rx76:tx79 +lane_to_serdes_map_fabric_lane76=rx76:tx76 lane_to_serdes_map_fabric_lane77=rx77:tx78 lane_to_serdes_map_fabric_lane78=rx78:tx77 -lane_to_serdes_map_fabric_lane79=rx79:tx76 +lane_to_serdes_map_fabric_lane79=rx79:tx79 lane_to_serdes_map_fabric_lane80=rx80:tx80 lane_to_serdes_map_fabric_lane81=rx81:tx81 lane_to_serdes_map_fabric_lane82=rx82:tx83 @@ -561,11 +561,11 @@ lane_to_serdes_map_fabric_lane86=rx86:tx84 lane_to_serdes_map_fabric_lane87=rx87:tx87 lane_to_serdes_map_fabric_lane88=rx88:tx90 lane_to_serdes_map_fabric_lane89=rx89:tx88 -lane_to_serdes_map_fabric_lane90=rx90:tx91 -lane_to_serdes_map_fabric_lane91=rx91:tx89 +lane_to_serdes_map_fabric_lane90=rx90:tx89 +lane_to_serdes_map_fabric_lane91=rx91:tx91 lane_to_serdes_map_fabric_lane92=rx92:tx93 -lane_to_serdes_map_fabric_lane93=rx93:tx92 -lane_to_serdes_map_fabric_lane94=rx94:tx94 +lane_to_serdes_map_fabric_lane93=rx93:tx94 +lane_to_serdes_map_fabric_lane94=rx94:tx92 lane_to_serdes_map_fabric_lane95=rx95:tx95 lane_to_serdes_map_fabric_lane96=rx96:tx96 lane_to_serdes_map_fabric_lane97=rx97:tx97 @@ -575,30 +575,30 @@ lane_to_serdes_map_fabric_lane100=rx100:tx100 lane_to_serdes_map_fabric_lane101=rx101:tx101 lane_to_serdes_map_fabric_lane102=rx102:tx102 lane_to_serdes_map_fabric_lane103=rx103:tx103 -lane_to_serdes_map_fabric_lane104=rx104:tx105 -lane_to_serdes_map_fabric_lane105=rx105:tx106 -lane_to_serdes_map_fabric_lane106=rx106:tx107 -lane_to_serdes_map_fabric_lane107=rx107:tx104 -lane_to_serdes_map_fabric_lane108=rx108:tx111 +lane_to_serdes_map_fabric_lane104=rx104:tx104 +lane_to_serdes_map_fabric_lane105=rx105:tx107 +lane_to_serdes_map_fabric_lane106=rx106:tx106 +lane_to_serdes_map_fabric_lane107=rx107:tx105 +lane_to_serdes_map_fabric_lane108=rx108:tx108 lane_to_serdes_map_fabric_lane109=rx109:tx109 lane_to_serdes_map_fabric_lane110=rx110:tx110 -lane_to_serdes_map_fabric_lane111=rx111:tx108 -lane_to_serdes_map_fabric_lane112=rx112:tx114 -lane_to_serdes_map_fabric_lane113=rx113:tx113 +lane_to_serdes_map_fabric_lane111=rx111:tx111 +lane_to_serdes_map_fabric_lane112=rx112:tx115 +lane_to_serdes_map_fabric_lane113=rx113:tx114 lane_to_serdes_map_fabric_lane114=rx114:tx112 -lane_to_serdes_map_fabric_lane115=rx115:tx115 -lane_to_serdes_map_fabric_lane116=rx116:tx117 -lane_to_serdes_map_fabric_lane117=rx117:tx116 -lane_to_serdes_map_fabric_lane118=rx118:tx119 -lane_to_serdes_map_fabric_lane119=rx119:tx118 -lane_to_serdes_map_fabric_lane120=rx120:tx123 -lane_to_serdes_map_fabric_lane121=rx121:tx120 -lane_to_serdes_map_fabric_lane122=rx122:tx122 -lane_to_serdes_map_fabric_lane123=rx123:tx121 -lane_to_serdes_map_fabric_lane124=rx124:tx127 -lane_to_serdes_map_fabric_lane125=rx125:tx125 -lane_to_serdes_map_fabric_lane126=rx126:tx124 -lane_to_serdes_map_fabric_lane127=rx127:tx126 +lane_to_serdes_map_fabric_lane115=rx115:tx113 +lane_to_serdes_map_fabric_lane116=rx116:tx118 +lane_to_serdes_map_fabric_lane117=rx117:tx119 +lane_to_serdes_map_fabric_lane118=rx118:tx116 +lane_to_serdes_map_fabric_lane119=rx119:tx117 +lane_to_serdes_map_fabric_lane120=rx120:tx121 +lane_to_serdes_map_fabric_lane121=rx121:tx122 +lane_to_serdes_map_fabric_lane122=rx122:tx120 +lane_to_serdes_map_fabric_lane123=rx123:tx123 +lane_to_serdes_map_fabric_lane124=rx124:tx124 +lane_to_serdes_map_fabric_lane125=rx125:tx127 +lane_to_serdes_map_fabric_lane126=rx126:tx126 +lane_to_serdes_map_fabric_lane127=rx127:tx125 lane_to_serdes_map_fabric_lane128=rx128:tx128 lane_to_serdes_map_fabric_lane129=rx129:tx129 lane_to_serdes_map_fabric_lane130=rx130:tx130 @@ -611,12 +611,12 @@ lane_to_serdes_map_fabric_lane136=rx136:tx139 lane_to_serdes_map_fabric_lane137=rx137:tx138 lane_to_serdes_map_fabric_lane138=rx138:tx137 lane_to_serdes_map_fabric_lane139=rx139:tx136 -lane_to_serdes_map_fabric_lane140=rx140:tx140 +lane_to_serdes_map_fabric_lane140=rx140:tx143 lane_to_serdes_map_fabric_lane141=rx141:tx142 lane_to_serdes_map_fabric_lane142=rx142:tx141 -lane_to_serdes_map_fabric_lane143=rx143:tx143 -lane_to_serdes_map_fabric_lane144=rx144:tx144 -lane_to_serdes_map_fabric_lane145=rx145:tx145 +lane_to_serdes_map_fabric_lane143=rx143:tx140 +lane_to_serdes_map_fabric_lane144=rx144:tx145 +lane_to_serdes_map_fabric_lane145=rx145:tx144 lane_to_serdes_map_fabric_lane146=rx146:tx146 lane_to_serdes_map_fabric_lane147=rx147:tx147 lane_to_serdes_map_fabric_lane148=rx148:tx148 @@ -632,8 +632,8 @@ lane_to_serdes_map_fabric_lane157=rx157:tx158 lane_to_serdes_map_fabric_lane158=rx158:tx157 lane_to_serdes_map_fabric_lane159=rx159:tx156 lane_to_serdes_map_fabric_lane160=rx160:tx160 -lane_to_serdes_map_fabric_lane161=rx161:tx161 -lane_to_serdes_map_fabric_lane162=rx162:tx162 +lane_to_serdes_map_fabric_lane161=rx161:tx162 +lane_to_serdes_map_fabric_lane162=rx162:tx161 lane_to_serdes_map_fabric_lane163=rx163:tx163 lane_to_serdes_map_fabric_lane164=rx164:tx164 lane_to_serdes_map_fabric_lane165=rx165:tx165 @@ -657,11 +657,11 @@ lane_to_serdes_map_fabric_lane182=rx182:tx180 lane_to_serdes_map_fabric_lane183=rx183:tx183 lane_to_serdes_map_fabric_lane184=rx184:tx186 lane_to_serdes_map_fabric_lane185=rx185:tx184 -lane_to_serdes_map_fabric_lane186=rx186:tx185 -lane_to_serdes_map_fabric_lane187=rx187:tx187 -lane_to_serdes_map_fabric_lane188=rx188:tx188 +lane_to_serdes_map_fabric_lane186=rx186:tx187 +lane_to_serdes_map_fabric_lane187=rx187:tx185 +lane_to_serdes_map_fabric_lane188=rx188:tx190 lane_to_serdes_map_fabric_lane189=rx189:tx189 -lane_to_serdes_map_fabric_lane190=rx190:tx190 +lane_to_serdes_map_fabric_lane190=rx190:tx188 lane_to_serdes_map_fabric_lane191=rx191:tx191 # diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm index ee9bf638a792..30b740af2ae2 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm @@ -453,17 +453,17 @@ fabric_connect_mode=FE fabric_logical_port_base=512 # Fabric lane mapping -lane_to_serdes_map_fabric_lane0=rx0:tx0 +lane_to_serdes_map_fabric_lane0=rx0:tx3 lane_to_serdes_map_fabric_lane1=rx1:tx1 lane_to_serdes_map_fabric_lane2=rx2:tx2 -lane_to_serdes_map_fabric_lane3=rx3:tx3 +lane_to_serdes_map_fabric_lane3=rx3:tx0 lane_to_serdes_map_fabric_lane4=rx4:tx4 lane_to_serdes_map_fabric_lane5=rx5:tx5 lane_to_serdes_map_fabric_lane6=rx6:tx6 lane_to_serdes_map_fabric_lane7=rx7:tx7 -lane_to_serdes_map_fabric_lane8=rx8:tx10 +lane_to_serdes_map_fabric_lane8=rx8:tx9 lane_to_serdes_map_fabric_lane9=rx9:tx11 -lane_to_serdes_map_fabric_lane10=rx10:tx9 +lane_to_serdes_map_fabric_lane10=rx10:tx10 lane_to_serdes_map_fabric_lane11=rx11:tx8 lane_to_serdes_map_fabric_lane12=rx12:tx12 lane_to_serdes_map_fabric_lane13=rx13:tx15 @@ -475,15 +475,15 @@ lane_to_serdes_map_fabric_lane18=rx18:tx16 lane_to_serdes_map_fabric_lane19=rx19:tx19 lane_to_serdes_map_fabric_lane20=rx20:tx21 lane_to_serdes_map_fabric_lane21=rx21:tx23 -lane_to_serdes_map_fabric_lane22=rx22:tx20 -lane_to_serdes_map_fabric_lane23=rx23:tx22 -lane_to_serdes_map_fabric_lane24=rx24:tx26 +lane_to_serdes_map_fabric_lane22=rx22:tx22 +lane_to_serdes_map_fabric_lane23=rx23:tx20 +lane_to_serdes_map_fabric_lane24=rx24:tx25 lane_to_serdes_map_fabric_lane25=rx25:tx24 -lane_to_serdes_map_fabric_lane26=rx26:tx25 -lane_to_serdes_map_fabric_lane27=rx27:tx27 +lane_to_serdes_map_fabric_lane26=rx26:tx27 +lane_to_serdes_map_fabric_lane27=rx27:tx26 lane_to_serdes_map_fabric_lane28=rx28:tx31 -lane_to_serdes_map_fabric_lane29=rx29:tx30 -lane_to_serdes_map_fabric_lane30=rx30:tx29 +lane_to_serdes_map_fabric_lane29=rx29:tx29 +lane_to_serdes_map_fabric_lane30=rx30:tx30 lane_to_serdes_map_fabric_lane31=rx31:tx28 lane_to_serdes_map_fabric_lane32=rx32:tx32 lane_to_serdes_map_fabric_lane33=rx33:tx33 @@ -522,17 +522,17 @@ lane_to_serdes_map_fabric_lane65=rx65:tx65 lane_to_serdes_map_fabric_lane66=rx66:tx66 lane_to_serdes_map_fabric_lane67=rx67:tx67 lane_to_serdes_map_fabric_lane68=rx68:tx68 -lane_to_serdes_map_fabric_lane69=rx69:tx69 -lane_to_serdes_map_fabric_lane70=rx70:tx70 -lane_to_serdes_map_fabric_lane71=rx71:tx71 +lane_to_serdes_map_fabric_lane69=rx69:tx70 +lane_to_serdes_map_fabric_lane70=rx70:tx71 +lane_to_serdes_map_fabric_lane71=rx71:tx69 lane_to_serdes_map_fabric_lane72=rx72:tx75 lane_to_serdes_map_fabric_lane73=rx73:tx74 lane_to_serdes_map_fabric_lane74=rx74:tx73 lane_to_serdes_map_fabric_lane75=rx75:tx72 -lane_to_serdes_map_fabric_lane76=rx76:tx79 +lane_to_serdes_map_fabric_lane76=rx76:tx76 lane_to_serdes_map_fabric_lane77=rx77:tx78 lane_to_serdes_map_fabric_lane78=rx78:tx77 -lane_to_serdes_map_fabric_lane79=rx79:tx76 +lane_to_serdes_map_fabric_lane79=rx79:tx79 lane_to_serdes_map_fabric_lane80=rx80:tx80 lane_to_serdes_map_fabric_lane81=rx81:tx81 lane_to_serdes_map_fabric_lane82=rx82:tx83 @@ -543,11 +543,11 @@ lane_to_serdes_map_fabric_lane86=rx86:tx84 lane_to_serdes_map_fabric_lane87=rx87:tx87 lane_to_serdes_map_fabric_lane88=rx88:tx90 lane_to_serdes_map_fabric_lane89=rx89:tx88 -lane_to_serdes_map_fabric_lane90=rx90:tx91 -lane_to_serdes_map_fabric_lane91=rx91:tx89 +lane_to_serdes_map_fabric_lane90=rx90:tx89 +lane_to_serdes_map_fabric_lane91=rx91:tx91 lane_to_serdes_map_fabric_lane92=rx92:tx93 -lane_to_serdes_map_fabric_lane93=rx93:tx92 -lane_to_serdes_map_fabric_lane94=rx94:tx94 +lane_to_serdes_map_fabric_lane93=rx93:tx94 +lane_to_serdes_map_fabric_lane94=rx94:tx92 lane_to_serdes_map_fabric_lane95=rx95:tx95 lane_to_serdes_map_fabric_lane96=rx96:tx96 lane_to_serdes_map_fabric_lane97=rx97:tx97 @@ -557,30 +557,30 @@ lane_to_serdes_map_fabric_lane100=rx100:tx100 lane_to_serdes_map_fabric_lane101=rx101:tx101 lane_to_serdes_map_fabric_lane102=rx102:tx102 lane_to_serdes_map_fabric_lane103=rx103:tx103 -lane_to_serdes_map_fabric_lane104=rx104:tx105 -lane_to_serdes_map_fabric_lane105=rx105:tx106 -lane_to_serdes_map_fabric_lane106=rx106:tx107 -lane_to_serdes_map_fabric_lane107=rx107:tx104 -lane_to_serdes_map_fabric_lane108=rx108:tx111 +lane_to_serdes_map_fabric_lane104=rx104:tx104 +lane_to_serdes_map_fabric_lane105=rx105:tx107 +lane_to_serdes_map_fabric_lane106=rx106:tx106 +lane_to_serdes_map_fabric_lane107=rx107:tx105 +lane_to_serdes_map_fabric_lane108=rx108:tx108 lane_to_serdes_map_fabric_lane109=rx109:tx109 lane_to_serdes_map_fabric_lane110=rx110:tx110 -lane_to_serdes_map_fabric_lane111=rx111:tx108 -lane_to_serdes_map_fabric_lane112=rx112:tx114 -lane_to_serdes_map_fabric_lane113=rx113:tx113 +lane_to_serdes_map_fabric_lane111=rx111:tx111 +lane_to_serdes_map_fabric_lane112=rx112:tx115 +lane_to_serdes_map_fabric_lane113=rx113:tx114 lane_to_serdes_map_fabric_lane114=rx114:tx112 -lane_to_serdes_map_fabric_lane115=rx115:tx115 -lane_to_serdes_map_fabric_lane116=rx116:tx117 -lane_to_serdes_map_fabric_lane117=rx117:tx116 -lane_to_serdes_map_fabric_lane118=rx118:tx119 -lane_to_serdes_map_fabric_lane119=rx119:tx118 -lane_to_serdes_map_fabric_lane120=rx120:tx123 -lane_to_serdes_map_fabric_lane121=rx121:tx120 -lane_to_serdes_map_fabric_lane122=rx122:tx122 -lane_to_serdes_map_fabric_lane123=rx123:tx121 -lane_to_serdes_map_fabric_lane124=rx124:tx127 -lane_to_serdes_map_fabric_lane125=rx125:tx125 -lane_to_serdes_map_fabric_lane126=rx126:tx124 -lane_to_serdes_map_fabric_lane127=rx127:tx126 +lane_to_serdes_map_fabric_lane115=rx115:tx113 +lane_to_serdes_map_fabric_lane116=rx116:tx118 +lane_to_serdes_map_fabric_lane117=rx117:tx119 +lane_to_serdes_map_fabric_lane118=rx118:tx116 +lane_to_serdes_map_fabric_lane119=rx119:tx117 +lane_to_serdes_map_fabric_lane120=rx120:tx121 +lane_to_serdes_map_fabric_lane121=rx121:tx122 +lane_to_serdes_map_fabric_lane122=rx122:tx120 +lane_to_serdes_map_fabric_lane123=rx123:tx123 +lane_to_serdes_map_fabric_lane124=rx124:tx124 +lane_to_serdes_map_fabric_lane125=rx125:tx127 +lane_to_serdes_map_fabric_lane126=rx126:tx126 +lane_to_serdes_map_fabric_lane127=rx127:tx125 lane_to_serdes_map_fabric_lane128=rx128:tx128 lane_to_serdes_map_fabric_lane129=rx129:tx129 lane_to_serdes_map_fabric_lane130=rx130:tx130 @@ -593,12 +593,12 @@ lane_to_serdes_map_fabric_lane136=rx136:tx139 lane_to_serdes_map_fabric_lane137=rx137:tx138 lane_to_serdes_map_fabric_lane138=rx138:tx137 lane_to_serdes_map_fabric_lane139=rx139:tx136 -lane_to_serdes_map_fabric_lane140=rx140:tx140 +lane_to_serdes_map_fabric_lane140=rx140:tx143 lane_to_serdes_map_fabric_lane141=rx141:tx142 lane_to_serdes_map_fabric_lane142=rx142:tx141 -lane_to_serdes_map_fabric_lane143=rx143:tx143 -lane_to_serdes_map_fabric_lane144=rx144:tx144 -lane_to_serdes_map_fabric_lane145=rx145:tx145 +lane_to_serdes_map_fabric_lane143=rx143:tx140 +lane_to_serdes_map_fabric_lane144=rx144:tx145 +lane_to_serdes_map_fabric_lane145=rx145:tx144 lane_to_serdes_map_fabric_lane146=rx146:tx146 lane_to_serdes_map_fabric_lane147=rx147:tx147 lane_to_serdes_map_fabric_lane148=rx148:tx148 @@ -614,8 +614,8 @@ lane_to_serdes_map_fabric_lane157=rx157:tx158 lane_to_serdes_map_fabric_lane158=rx158:tx157 lane_to_serdes_map_fabric_lane159=rx159:tx156 lane_to_serdes_map_fabric_lane160=rx160:tx160 -lane_to_serdes_map_fabric_lane161=rx161:tx161 -lane_to_serdes_map_fabric_lane162=rx162:tx162 +lane_to_serdes_map_fabric_lane161=rx161:tx162 +lane_to_serdes_map_fabric_lane162=rx162:tx161 lane_to_serdes_map_fabric_lane163=rx163:tx163 lane_to_serdes_map_fabric_lane164=rx164:tx164 lane_to_serdes_map_fabric_lane165=rx165:tx165 @@ -639,11 +639,11 @@ lane_to_serdes_map_fabric_lane182=rx182:tx180 lane_to_serdes_map_fabric_lane183=rx183:tx183 lane_to_serdes_map_fabric_lane184=rx184:tx186 lane_to_serdes_map_fabric_lane185=rx185:tx184 -lane_to_serdes_map_fabric_lane186=rx186:tx185 -lane_to_serdes_map_fabric_lane187=rx187:tx187 -lane_to_serdes_map_fabric_lane188=rx188:tx188 +lane_to_serdes_map_fabric_lane186=rx186:tx187 +lane_to_serdes_map_fabric_lane187=rx187:tx185 +lane_to_serdes_map_fabric_lane188=rx188:tx190 lane_to_serdes_map_fabric_lane189=rx189:tx189 -lane_to_serdes_map_fabric_lane190=rx190:tx190 +lane_to_serdes_map_fabric_lane190=rx190:tx188 lane_to_serdes_map_fabric_lane191=rx191:tx191 # diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/platform_reboot b/device/mellanox/x86_64-mlnx_lssn2700-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_lssn2700-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_lssn2700-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2010-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn2010-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn2010-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn2010-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2100-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn2100-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn2100-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn2100-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2410-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn2410-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn2410-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn2410-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot deleted file mode 100755 index 9b68790498a1..000000000000 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -declare -r EXIT_SUCCESS="0" -declare -r EXIT_ERROR="1" - -declare -r PENDING_COMPONENT_FW="/usr/bin/install-pending-fw.py" -declare -r FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh" -declare -r SYSFS_PWR_CYCLE="/var/run/hw-management/system/pwr_cycle" - -FORCE_REBOOT="no" - -function ParseArguments() { - while [ $# -ge 1 ]; do - case "$1" in - -f|--force) - FORCE_REBOOT="yes" - ;; - esac - shift - done -} - -function SafePwrCycle() { - sync; sync - umount -fa > /dev/null 2>&1 - echo 1 > $SYSFS_PWR_CYCLE -} - -ParseArguments "$@" - -# Reboot immediately if the kdump capture kernel is running -VMCORE_FILE=/proc/vmcore -if [ -s $VMCORE_FILE ]; then - sync; sync - umount -fa > /dev/null 2>&1 - - # Run Debian reboot because the platform reboot isn't available - /sbin/reboot -fi - - -${FW_UPGRADE_SCRIPT} --upgrade --verbose -EXIT_CODE="$?" -if [[ "${EXIT_CODE}" != "${EXIT_SUCCESS}" ]]; then - echo "Failed to burn MLNX FW: errno=${EXIT_CODE}" - - if [[ "${FORCE_REBOOT}" != "yes" ]]; then - echo "Reboot is interrupted: use -f|--force to override" - exit "${EXIT_ERROR}" - fi -fi - -${PENDING_COMPONENT_FW} - -SafePwrCycle diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn2700-r0/pre_reboot_hook new file mode 100755 index 000000000000..134357d320f1 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/pre_reboot_hook @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright (c) 2020-2023 NVIDIA CORPORATION & AFFILIATES. +# Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +declare -r EXIT_SUCCESS=0 +declare -r EXIT_ERROR=1 + +declare -r PENDING_COMPONENT_FW="/usr/bin/install-pending-fw.py" +declare -r FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh" + + +${FW_UPGRADE_SCRIPT} --upgrade --verbose +EXIT_CODE=$? +if [[ ${EXIT_CODE} != ${EXIT_SUCCESS} ]]; then + echo "Failed to burn MLNX FW: errno=${EXIT_CODE}" + exit ${EXIT_ERROR} +fi + +${PENDING_COMPONENT_FW} + +exit ${EXIT_SUCCESS} \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2700a1-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2700a1-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn2700a1-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2700a1-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn2700a1-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn2700a1-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn2740-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn2740-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn2740-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn2740-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn3420-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn3420-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn3420-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn3420-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn3420-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn3700-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn3700-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn3700-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn3700-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn3700c-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn3700c-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn3700c-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn3800-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn3800-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn3800-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4410-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn4410-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn4410-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4410-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4600-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn4600-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4600-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn4600-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4600-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn4600c-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/pre_reboot_hook b/device/mellanox/x86_64-mlnx_msn4700-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-nvidia_sn2201-r0/platform_reboot b/device/mellanox/x86_64-nvidia_sn2201-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-nvidia_sn2201-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-nvidia_sn2201-r0/pre_reboot_hook b/device/mellanox/x86_64-nvidia_sn2201-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-nvidia_sn2201-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-nvidia_sn4800-r0/platform_reboot b/device/mellanox/x86_64-nvidia_sn4800-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-nvidia_sn4800-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-nvidia_sn4800-r0/pre_reboot_hook b/device/mellanox/x86_64-nvidia_sn4800-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-nvidia_sn4800-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/platform_reboot b/device/mellanox/x86_64-nvidia_sn5600-r0/platform_reboot deleted file mode 120000 index 43c8ea567493..000000000000 --- a/device/mellanox/x86_64-nvidia_sn5600-r0/platform_reboot +++ /dev/null @@ -1 +0,0 @@ -../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/pre_reboot_hook b/device/mellanox/x86_64-nvidia_sn5600-r0/pre_reboot_hook new file mode 120000 index 000000000000..6fc31078ee86 --- /dev/null +++ b/device/mellanox/x86_64-nvidia_sn5600-r0/pre_reboot_hook @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pre_reboot_hook \ No newline at end of file diff --git a/dockers/docker-database/docker-database-init.sh b/dockers/docker-database/docker-database-init.sh index f6f8522bb944..f3679e08aeab 100755 --- a/dockers/docker-database/docker-database-init.sh +++ b/dockers/docker-database/docker-database-init.sh @@ -61,12 +61,16 @@ cp $db_cfg_file $db_cfg_file_tmp if [[ $DATABASE_TYPE == "chassisdb" ]]; then # Docker init for database-chassis echo "Init docker-database-chassis..." + VAR_LIB_REDIS_CHASSIS_DIR="/var/lib/redis_chassis" + mkdir -p $VAR_LIB_REDIS_CHASSIS_DIR update_chassisdb_config -j $db_cfg_file_tmp -k -p $chassis_db_port # generate all redis server supervisord configuration file sonic-cfggen -j $db_cfg_file_tmp \ -t /usr/share/sonic/templates/supervisord.conf.j2,/etc/supervisor/conf.d/supervisord.conf \ -t /usr/share/sonic/templates/critical_processes.j2,/etc/supervisor/critical_processes rm $db_cfg_file_tmp + chown -R redis:redis $VAR_LIB_REDIS_CHASSIS_DIR + chown -R redis:redis $REDIS_DIR exec /usr/local/bin/supervisord exit 0 fi diff --git a/files/image_config/rsyslog/rsyslog.conf.j2 b/files/image_config/rsyslog/rsyslog.conf.j2 index c29d803d085a..f6d480494091 100644 --- a/files/image_config/rsyslog/rsyslog.conf.j2 +++ b/files/image_config/rsyslog/rsyslog.conf.j2 @@ -107,7 +107,7 @@ $RepeatedMsgReduction on {% set regex = conf.get('filter_regex') -%} {% set fmodifier = '!' if filter == 'exclude' else '' %} -{% set device = 'eth0' if vrf == 'default' else vrf -%} +{% set device = vrf if vrf != '' and vrf != 'default' -%} {% set template = 'WelfRemoteFormat' if format == 'welf' else 'SONiCFileFormat' -%} {# Server extra options -#} @@ -115,11 +115,16 @@ $RepeatedMsgReduction on {% if source -%} {% set options = options ~ ' Address="' ~ source ~ '"'-%} + {% set device = device if device != 'eth0' else '' -%} +{% endif -%} + +{% if device -%} + {% set options = options ~ ' Device="' ~ device ~ '"'-%} {% endif -%} {% if filter %} :msg, {{ fmodifier }}ereregex, "{{ regex }}" {% endif %} *.{{ severity }} -action(type="omfwd" Target="{{ server }}" Port="{{ port }}" Protocol="{{ proto }}" Device="{{ device }}" Template="{{ template }}"{{ options }}) +action(type="omfwd" Target="{{ server }}" Port="{{ port }}" Protocol="{{ proto }}" Template="{{ template }}"{{ options }}) {% endfor %} diff --git a/platform/broadcom/sonic-platform-modules-nokia b/platform/broadcom/sonic-platform-modules-nokia index 1ef68bdba5df..84092782791e 160000 --- a/platform/broadcom/sonic-platform-modules-nokia +++ b/platform/broadcom/sonic-platform-modules-nokia @@ -1 +1 @@ -Subproject commit 1ef68bdba5dfcb1b7946c952ee233f0ee5b7738a +Subproject commit 84092782791ecc42b4f597fbea0c16204e4a8f9d diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk index 2fd01811eae5..4dbdf07cff1f 100644 --- a/platform/mellanox/mft.mk +++ b/platform/mellanox/mft.mk @@ -16,8 +16,8 @@ # # Mellanox SAI -MFT_VERSION = 4.25.0 -MFT_REVISION = 62 +MFT_VERSION = 4.27.0 +MFT_REVISION = 83 MLNX_MFT_INTERNAL_SOURCE_BASE_URL = diff --git a/platform/mellanox/mft/Makefile b/platform/mellanox/mft/Makefile index 2447e4b2aa3f..2f331ea879ce 100644 --- a/platform/mellanox/mft/Makefile +++ b/platform/mellanox/mft/Makefile @@ -42,8 +42,7 @@ DERIVED_TARGETS = mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_$(CONFIGURED_ARCH).deb DKMS_CTRL = /var/lib/dkms/kernel-mft-dkms/ DKMS_TMP := $(shell mktemp -u -d -t dkms.XXXXXXXXXX) -MFT_DEB_TMP := $(shell mktemp -u -d -t mft.deb.XXXXXXXXXX) -MFT_TMP := $(shell mktemp -u -d -t mft.XXXXXXXXXX) +MFT_TMP = /tmp/mft_build/ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : mkdir -p $(MFT_TMP) @@ -51,19 +50,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : wget -O $(MFT_TGZ) $(MFT_TGZ_URL) tar xzf $(MFT_TGZ) - # w/a: disable bash autocompletion - mkdir -p $(MFT_DEB_TMP)/DEBIAN - - dpkg -e $(MFT_NAME)/DEBS/$(MAIN_TARGET) $(MFT_DEB_TMP)/DEBIAN - dpkg -x $(MFT_NAME)/DEBS/$(MAIN_TARGET) $(MFT_DEB_TMP) - - rm -rf $(MFT_DEB_TMP)/etc/bash_completion.d - sed -i '/bash_completion.d/d' $(MFT_DEB_TMP)/DEBIAN/conffiles - - dpkg -b $(MFT_DEB_TMP) $(MFT_NAME)/DEBS/$(MAIN_TARGET) - - rm -rf $(MFT_DEB_TMP) - # fix timestamp touch $(MFT_NAME)/DEBS/*.deb mv $(MFT_NAME)/DEBS/*.deb $(DEST) diff --git a/src/sonic-swss-common b/src/sonic-swss-common index e7917acd2d4a..8e24cedf016c 160000 --- a/src/sonic-swss-common +++ b/src/sonic-swss-common @@ -1 +1 @@ -Subproject commit e7917acd2d4a9c0121802437e3c899bd513ac888 +Subproject commit 8e24cedf016c73112561eac4c7f6a6fe3b21faf3 diff --git a/src/wpasupplicant/sonic-wpa-supplicant b/src/wpasupplicant/sonic-wpa-supplicant index 13e6f11007d3..3c7fd8e10d0e 160000 --- a/src/wpasupplicant/sonic-wpa-supplicant +++ b/src/wpasupplicant/sonic-wpa-supplicant @@ -1 +1 @@ -Subproject commit 13e6f11007d3e6d33a514a702fea5d40daaad055 +Subproject commit 3c7fd8e10d0e675c3cc1376206a2276e4d8e16da