Skip to content

Commit

Permalink
Port networking build failure fix to 23.07 branch (#396)
Browse files Browse the repository at this point in the history
* Update ipdk_v23.07 release notes on main branch

Signed-off-by: Sabeel Ansari <[email protected]>

* Update p4c, psde and infrap4d SHA for 23.07 release

Signed-off-by: Sabeel Ansari <[email protected]>

* update distro_pkg_install.sh and build_p4c.sh (#395)

Address two build issues:

- Missing 'netaddr' module. Updated install script to provide it.
- Compile errors in P4C. The latest P4C compiler uses some code from bmv2 , so it shouldn't be disabled. Removed
ENABLE_BMV2=OFF from the cmake command. Verified with compiler team that this is correct.

Signed-off-by: bharticemk <[email protected]>

---------

Signed-off-by: Sabeel Ansari <[email protected]>
Signed-off-by: bharticemk <[email protected]>
Co-authored-by: Filip Szufnarowski <[email protected]>
Co-authored-by: Richa Bharti <[email protected]>
  • Loading branch information
3 people authored Aug 1, 2023
1 parent 7af1678 commit 2d907cd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 0 additions & 1 deletion build/networking/scripts/build_p4c.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ git submodule update --init --recursive
mkdir build && mkdir -p "${WORKING_DIR}"/p4c/install && cd build

cmake -DCMAKE_INSTALL_PREFIX="${WORKING_DIR}"/p4c/install \
-DENABLE_BMV2=OFF \
-DENABLE_EBPF=OFF \
-DENABLE_UBPF=OFF \
-DENABLE_GTESTS=OFF \
Expand Down
6 changes: 6 additions & 0 deletions build/networking/scripts/distro_pkg_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ fedora_install_build_pkgs() {

python -m pip install --upgrade pip
python -m pip install grpcio
python -m pip install netaddr
python -m pip install ovspy
python -m pip install protobuf==3.20.3
python -m pip install p4runtime
Expand Down Expand Up @@ -86,6 +87,7 @@ fedora_install_deployment_pkgs() {

python -m pip install --upgrade pip
python -m pip install grpcio
python -m pip install netaddr
python -m pip install ovspy
python -m pip install protobuf==3.20.3
python -m pip install p4runtime
Expand Down Expand Up @@ -119,6 +121,7 @@ fedora_install_default_pkgs() {

python -m pip install --upgrade pip
python -m pip install grpcio
python -m pip install netaddr
python -m pip install ovspy
python -m pip install protobuf==3.20.3
python -m pip install p4runtime
Expand Down Expand Up @@ -185,6 +188,7 @@ ubuntu_install_build_pkgs() {

python3 -m pip install --no-cache-dir --upgrade pip
python3 -m pip install --no-cache-dir grpcio
python3 -m pip install --no-cache-dir netaddr
python3 -m pip install --no-cache-dir ovspy \
protobuf=="${PROTOBUF_VER}" \
p4runtime \
Expand Down Expand Up @@ -221,6 +225,7 @@ ubuntu_install_deployment_pkgs() {

python3 -m pip install --no-cache-dir --upgrade pip
python3 -m pip install --no-cache-dir grpcio
python3 -m pip install --no-cache-dir netaddr
python3 -m pip install --no-cache-dir ovspy \
protobuf=="${PROTOBUF_VER}" \
p4runtime
Expand Down Expand Up @@ -258,6 +263,7 @@ ubuntu_install_default_pkgs() {

python3 -m pip install --no-cache-dir --upgrade pip
python3 -m pip install --no-cache-dir grpcio
python3 -m pip install --no-cache-dir netaddr
python3 -m pip install --no-cache-dir ovspy \
protobuf=="${PROTOBUF_VER}" \
p4runtime
Expand Down

0 comments on commit 2d907cd

Please sign in to comment.