From b0efc44d92b6bf02ef2896457b879f4d954c69c8 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sun, 22 May 2022 15:56:40 -0400 Subject: [PATCH] 2022 may updates to vm ubuntu 20.04 (#470) * Put latest commits for p4lang repos as of 2022-May-01 in build scripts * Updates to steps to build behavioral-model for 2022-May The parts of these changes on how to build simple_switch_grpc are due to changes made in the behavioral-model recently, perhaps in 2022-Apr. The removing of the applying of the patch is from older changes in behavioral-model around 2022-Jan. The patch is no longer needed. * Correction to script changes in previous commit * Add --with-thrift option to configure command for behavioral-model I believe that without that, the simple_switch_grpc process is built without support for listening on the Thrift port (default value of port is 9090). Co-authored-by: Andy Fingerhut --- vm-ubuntu-20.04/user-dev-bootstrap.sh | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/vm-ubuntu-20.04/user-dev-bootstrap.sh b/vm-ubuntu-20.04/user-dev-bootstrap.sh index 7b43304..3f91652 100755 --- a/vm-ubuntu-20.04/user-dev-bootstrap.sh +++ b/vm-ubuntu-20.04/user-dev-bootstrap.sh @@ -4,10 +4,10 @@ set -xe #Src -BMV2_COMMIT="434eda7658c2fd8a8e31500e98dab9e7c1e1b0ca" # 2022-Apr-02 -PI_COMMIT="f547455a260b710706bef82afab4cb9937bac416" # 2022-Apr-02 -P4C_COMMIT="e1ce01b12918163570fe2c8e70a41d21ec0ca15f" # 2022-Apr-02 -PTF_COMMIT="8140532764fff58b40d0c5c995f058a6e1b36a55" # 2022-Apr-02 +BMV2_COMMIT="f16d0de3486aa7fb2e1fe554aac7d237cc1adc33" # 2022-May-01 +PI_COMMIT="f547455a260b710706bef82afab4cb9937bac416" # 2022-May-01 +P4C_COMMIT="1471fdd22b683e1946b7730d83c877d94daba683" # 2022-May-01 +PTF_COMMIT="405513bcad2eae3092b0ac4ceb31e8dec5e32311" # 2022-May-01 PROTOBUF_COMMIT="v3.6.1" GRPC_COMMIT="tags/v1.17.2" @@ -171,24 +171,15 @@ find /usr/lib /usr/local $HOME/.local | sort > $HOME/usr-local-4-after-PI.txt git clone https://github.com/p4lang/behavioral-model.git cd behavioral-model git checkout ${BMV2_COMMIT} -PATCH_DIR="${HOME}/patches" -patch -p1 < "${PATCH_DIR}/behavioral-model-use-correct-libssl-pkg.patch" || echo "Errors while attempting to patch behavioral-model, but continuing anyway ..." ./install_deps.sh ./autogen.sh -./configure --enable-debugger --with-pi +./configure --enable-debugger --with-pi --with-thrift make -j${NUM_CORES} -sudo make install -sudo ldconfig -# Simple_switch_grpc target -cd targets/simple_switch_grpc -./autogen.sh -./configure --with-thrift -make -j${NUM_CORES} -sudo make install +sudo make install-strip sudo ldconfig # install-p4dev-v4.sh script does this here: move_usr_local_lib_python3_from_site_packages_to_dist_packages -cd ../../.. +cd .. find /usr/lib /usr/local $HOME/.local | sort > $HOME/usr-local-5-after-behavioral-model.txt