Skip to content

Commit b832f04

Browse files
authored
More updates for 2024 nov 01 (#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 <andy_fingerhut@alum.wustl.edu> * 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 <andy_fingerhut@alum.wustl.edu> * More updates needed for 2024-Nov-01 successful VM creation Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu> --------- Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
1 parent cf751d4 commit b832f04

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

vm-ubuntu-20.04/root-dev-bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ sudo pip3 install protobuf==3.18.1
109109
# Starting in 2019-Nov, Python3 version of Scapy is needed for `cd
110110
# p4c/build ; make check` to succeed.
111111
# ply package is needed for ebpf and ubpf backend tests to pass
112-
sudo pip3 install scapy ply
112+
sudo pip3 install scapy==2.5.0 ply
113113

114114
# Things needed for PTF
115115
sudo pip3 install pypcap

vm-ubuntu-20.04/root-release-bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ apt-get install -qq -y --no-install-recommends --fix-missing\
3939
p4lang-bmv2 \
4040
p4lang-pi
4141

42-
sudo pip3 install -U scapy ptf psutil grpcio
42+
sudo pip3 install -U scapy==2.5.0 ptf psutil grpcio

vm-ubuntu-20.04/user-dev-bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ git checkout ${P4C_COMMIT}
203203
git submodule update --init --recursive
204204
mkdir -p build
205205
cd build
206-
cmake .. -DENABLE_TEST_TOOLS=ON
206+
cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TEST_TOOLS=ON
207207
# The command 'make -j${NUM_CORES}' works fine for the others, but
208208
# with 2 GB of RAM for the VM, there are parts of the p4c build where
209209
# running 2 simultaneous C++ compiler runs requires more than that

vm-ubuntu-24.04/user-dev-bootstrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ git checkout ${P4C_COMMIT}
131131
git submodule update --init --recursive
132132
mkdir -p build
133133
cd build
134-
cmake .. -DENABLE_TEST_TOOLS=ON
134+
cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_TEST_TOOLS=ON
135135
# -j3 assumes 6+ GB of RAM and 3+ vCPUs in VM
136136
make -j3
137137
sudo make install/strip

0 commit comments

Comments
 (0)