[barefoot][build] Fixed BFN platform build failure (#3766)

Signed-off-by: Andriy Kokhan <[email protected]>
sonic-net · Nov 20, 2019 · fc495dc · fc495dc
1 parent 0e0699c
commit fc495dc
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 19 deletions.
diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "switchapi_port_add": false,
             "non_default_port_ppgs": 5
         }

diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf
@@ -27,7 +27,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "switchapi_port_add": false,
             "non_default_port_ppgs": 5
         }

diff --git a/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf b/device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf
@@ -27,7 +27,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/barefoot/x86_64-accton_as9516bf_32d-r0/newport/switch-tna-sai.conf b/device/barefoot/x86_64-accton_as9516bf_32d-r0/newport/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-accton_wedge100bf_32x-r0/libpltfm_mgr.so",
             "switchapi_port_add": false,
             "non_default_port_ppgs": 5

diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-accton_wedge100bf_65x-r0/libpltfm_mgr.so",
             "switchapi_port_add": false,
             "non_default_port_ppgs": 5

diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-sai.conf b/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-ingrasys_s9180_32x-r0/libpltfm_mgr.so",
             "switchapi_port_add": false
         }

diff --git a/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf b/device/ingrasys/x86_64-ingrasys_s9180_32x-r0/INGRASYS-S9180-32X/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-sai.conf b/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-ingrasys_s9280_64x-r0/libpltfm_mgr.so",
             "switchapi_port_add": false
         }

diff --git a/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf b/device/ingrasys/x86_64-ingrasys_s9280_64x-r0/INGRASYS-S9280-64X/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-sai.conf b/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-sai.conf
@@ -25,7 +25,7 @@
             "table-config": "share/tofinopd/switch/context.json",
             "tofino-bin": "share/tofinopd/switch/tofino.bin",
             "switchapi": "lib/libswitchapi.so",
-            "switchsai": "lib/libswitchsai.so",
+            "sai": "lib/libsai.so",
             "agent0": "lib/platform/x86_64-wnc_osw1800-r0/libpltfm_mgr.so",
             "switchapi_port_add": false
         }

diff --git a/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf b/device/wnc/x86_64-wnc_osw1800-r0/OSW1800-48x6q/switch-tna-sai.conf
@@ -28,7 +28,7 @@
                         }
                     ],
                     "program-name": "switch",
-                    "switchsai": "lib/libswitchsai.so",
+                    "sai": "lib/libsai.so",
                     "bfrt-config": "share/switch/bf-rt.json",
                     "model_json_path" : "share/switch/aug_model.json",
                     "switchapi_port_add": false,

diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
@@ -1,5 +1,5 @@
-BFN_PLATFORM = bfnplatform_20191107_deb9.deb
-$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20191107_deb9.deb"
+BFN_PLATFORM = bfnplatform_20191115_deb9.deb
+$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20191115_deb9.deb"
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM)
 $(BFN_SAI_DEV)_DEPENDS += $(BFN_PLATFORM)
diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
@@ -1,5 +1,5 @@
-BFN_SAI = bfnsdk_20191107_deb9.deb
-$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20191107_deb9.deb"
+BFN_SAI = bfnsdk_20191115_deb9.deb
+$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20191115_deb9.deb"
 
 SONIC_ONLINE_DEBS += $(BFN_SAI)
 $(BFN_SAI_DEV)_DEPENDS += $(BFN_SAI)