Merge pull request facebook#23 from eerpini/upgrade-aqua-sai-9.0.0.7

Upgrade to Aqua SAI 9.0.0.7 EA drop.

Author: eerpini

arista/build-utils/build.sh

@@ -93,9 +93,9 @@ pip3 install GitPython
 SAI_DIR="$FBOSS_DIR/Aqua_SAI/"
 if [ $ARCH == "dnx" ];
 then
-   SAI_BUILD_DIR="$SAI_DIR/output/x86-dnx-deb-static-meta"
+   SAI_BUILD_DIR="$SAI_DIR/output/x86-dnx-deb-static-fboss"
 else
-   SAI_BUILD_DIR="$SAI_DIR/output/x86-xgsall-deb-static"
+   SAI_BUILD_DIR="$SAI_DIR/output/x86-xgsall-deb-static-fboss"
 fi
 
 # Delete SDK var in the env. It can cause the SDK build to fail.

arista/fbossctl

@@ -73,12 +73,15 @@ maybe_setup_build_env() {
    git clone git@github.com:aristanetworks/Aqua_SAI.git
    cd "${FBOSS_HOST_DIR}/Aqua_SAI"
    git pull
-   git checkout REL_SAI_EA_9.0.0.6_META_030123
+   git checkout REL_SAI_EA_9.0.0.7_META_032223
    wget http://dist/storage/fboss/FBOSS-SAI/patch0-Jupiter-SAI-Makefile.patch
    git apply patch0-Jupiter-SAI-Makefile.patch
    cd "${FBOSS_HOST_DIR}/Aqua_SAI/sdk-src/hsdk_6.5.28_SAI_9.0.0_EA"
-   wget http://dist/storage/fboss/FBOSS-SAI/sai-sdk-all-6.5.28-cf57740b7.tar.xz
-   tar -xf sai-sdk-all-6.5.28-cf57740b7.tar.xz
+   wget http://dist/storage/fboss/FBOSS-SAI/sai-sdk-all-6.5.28-02b1402dd.tar.xz
+   tar -xf sai-sdk-all-6.5.28-02b1402dd.tar.xz
+   # Patch Broadcom DNX kernel module make file fixes for SDK 6.5.28
+   wget http://dist/storage/fboss/FBOSS-SAI/patch3-SDK-6_5_28_DNX_Kernel_Module_fixes.patch
+   patch "dnx-sdk-6.5.28-gpl-modules/make/Make.config" < patch3-SDK-6_5_28_DNX_Kernel_Module_fixes.patch
 
    # Download FBOSS linux header files.
    cd "${FBOSS_HOST_DIR}"