Skip to content

Commit b0353f6

Browse files
authored
Updates for 2026-jun-01 (#745)
* 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> * Add 2025-Jan-30 versions of source code for install.sh Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu> * Updates for 2026-Jun-01 Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu> --------- Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
1 parent df4a900 commit b0353f6

6 files changed

Lines changed: 46 additions & 111 deletions

vm-ubuntu-24.04/install-p4dev-v8.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ else
849849
git log -n 1
850850
TIME_BEHAVIORAL_MODEL_INSTALL_START=$(date +%s)
851851
PATCH_DIR="${THIS_SCRIPT_DIR_ABSOLUTE}/patches"
852-
patch -p1 < "${PATCH_DIR}/behavioral-model-support-fedora.patch"
852+
patch -p1 < "${PATCH_DIR}/behavioral-model-adjust-ubuntu-packges.patch"
853853
patch -p1 < "${PATCH_DIR}/behavioral-model-support-venv-2026-apr.patch"
854854
# This command installs Thrift, which I want to include in my build of
855855
# simple_switch_grpc

vm-ubuntu-24.04/install.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ else
4545
fi
4646

4747
case ${VERSION} in
48-
2026-May-01)
49-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="08bba268ecf3c92e53778b9605696c1e2c46d9e8"
50-
export INSTALL_PI_SOURCE_VERSION="51805c0108cb49e85e4812dd05bb6693b1f48f85"
51-
export INSTALL_P4C_SOURCE_VERSION="fe95abfa3318512732776a1ad0aa83b4f2192216"
52-
export INSTALL_PTF_SOURCE_VERSION="c67ca73692fb1ec23e0b11c7f5b03f1633da09a2"
48+
2026-Jun-01)
49+
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="282fce33f94046150781e0cb2e1576a01a2522b9"
50+
export INSTALL_PI_SOURCE_VERSION="c99ed2ad5d2614be33e788d9c5f32f4f22e9c384"
51+
export INSTALL_P4C_SOURCE_VERSION="78157dc6c13157df802309313d1005b77cfbe7b1"
52+
export INSTALL_PTF_SOURCE_VERSION="c15b9e8273976559e6c08e6ca8dc5ff1e2a0a623"
5353
;;
5454
latest)
5555
echo "Using the latest version of all p4lang repository source code."
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
diff --git a/install_deps.sh b/install_deps.sh
2+
index 02dd6d2..7673969 100755
3+
--- a/install_deps.sh
4+
+++ b/install_deps.sh
5+
@@ -18,31 +18,20 @@ sudo apt-get install -y \
6+
g++ \
7+
libboost-dev \
8+
libboost-program-options-dev \
9+
+ libboost-test-dev \
10+
libboost-thread-dev \
11+
libevent-dev \
12+
libffi-dev \
13+
libgmp-dev \
14+
- libgrpc++-dev \
15+
- libgrpc-dev \
16+
libjsoncpp-dev \
17+
- libnanomsg-dev \
18+
libpcap-dev \
19+
- libprotobuf-dev \
20+
- libprotoc-dev \
21+
- libreadline-dev \
22+
libssl-dev \
23+
- libthrift-dev \
24+
libtool \
25+
libtool-bin \
26+
libxxhash-dev \
27+
pkg-config \
28+
- protobuf-compiler \
29+
- protobuf-compiler-grpc \
30+
python3-dev \
31+
python3-pip \
32+
- python3-six \
33+
- python3-thrift \
34+
- thrift-compiler \
35+
wget
36+
37+
tmpdir=`mktemp -d -p .`
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SPDX-FileCopyrightText: 2026 Andy Fingerhut
2+
3+
SPDX-License-Identifier: Apache-2.0

vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch

Lines changed: 0 additions & 102 deletions
This file was deleted.

vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch.license

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)