More updates for 2024 nov 01 (p4lang#645)

* Move optional steps for testing VMs out of README.md file This may help avoid new users being confused that they must follow those instructions. Signed-off-by: Andy Fingerhut <[email protected]> * Update versions of P4 dev tools to latest as of 2024-Nov-01 for both vm-ubuntu-24.04 and vm-ubuntu-20.04 Signed-off-by: Andy Fingerhut <[email protected]> * More updates needed for 2024-Nov-01 successful VM creation Signed-off-by: Andy Fingerhut <[email protected]> --------- Signed-off-by: Andy Fingerhut <[email protected]>
jafingerhut · Dec 23, 2024 · 85e5b62 · 85e5b62
1 parent 5de6645
commit 85e5b62
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/vm-ubuntu-20.04/root-dev-bootstrap.sh b/vm-ubuntu-20.04/root-dev-bootstrap.sh
@@ -109,7 +109,7 @@ sudo pip3 install protobuf==3.18.1
 # Starting in 2019-Nov, Python3 version of Scapy is needed for `cd
 # p4c/build ; make check` to succeed.
 # ply package is needed for ebpf and ubpf backend tests to pass
-sudo pip3 install scapy ply
+sudo pip3 install scapy==2.5.0 ply
 
 # Things needed for PTF
 sudo pip3 install pypcap

diff --git a/vm-ubuntu-20.04/root-release-bootstrap.sh b/vm-ubuntu-20.04/root-release-bootstrap.sh
@@ -39,4 +39,4 @@ apt-get install -qq -y --no-install-recommends --fix-missing\
   p4lang-bmv2 \
   p4lang-pi
 
-sudo pip3 install -U scapy ptf psutil grpcio
+sudo pip3 install -U scapy==2.5.0 ptf psutil grpcio
diff --git a/vm-ubuntu-20.04/user-dev-bootstrap.sh b/vm-ubuntu-20.04/user-dev-bootstrap.sh
@@ -203,7 +203,7 @@ git checkout ${P4C_COMMIT}
 git submodule update --init --recursive
 mkdir -p build
 cd build
-cmake .. -DENABLE_TEST_TOOLS=ON
+cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TEST_TOOLS=ON
 # The command 'make -j${NUM_CORES}' works fine for the others, but
 # with 2 GB of RAM for the VM, there are parts of the p4c build where
 # running 2 simultaneous C++ compiler runs requires more than that

diff --git a/vm-ubuntu-24.04/user-dev-bootstrap.sh b/vm-ubuntu-24.04/user-dev-bootstrap.sh
@@ -131,7 +131,7 @@ git checkout ${P4C_COMMIT}
 git submodule update --init --recursive
 mkdir -p build
 cd build
-cmake .. -DENABLE_TEST_TOOLS=ON
+cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TEST_TOOLS=ON
 # -j3 assumes 6+ GB of RAM and 3+ vCPUs in VM
 make -j3
 sudo make install/strip