Skip to content

Commit ebbc278

Browse files
jafingerhutjafingerhut
authored
Updates for 2026-May-01 (p4lang#741)
* 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-May-01 Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu> --------- Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
1 parent ce7d49f commit ebbc278

5 files changed

Lines changed: 11 additions & 69 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ echo "+ behavioral-model: github.com/p4lang/behavioral-model latest version"
411411
echo " which, as of 2023-Sep-22, also installs these things:"
412412
echo " + thrift version 0.16.0"
413413
echo " + nanomsg version 1.0.0"
414-
echo " + nnpy latest version available via 'pip install'"
414+
echo " + pynng version 0.9.0"
415415
echo "+ p4c: github.com/p4lang/p4c latest version"
416416
echo "+ ptf: github.com/p4lang/ptf latest version"
417417
echo "+ Mininet: github.com/mininet/mininet latest version as of 2024-Sep-18"
@@ -850,7 +850,7 @@ else
850850
TIME_BEHAVIORAL_MODEL_INSTALL_START=$(date +%s)
851851
PATCH_DIR="${THIS_SCRIPT_DIR_ABSOLUTE}/patches"
852852
patch -p1 < "${PATCH_DIR}/behavioral-model-support-fedora.patch"
853-
patch -p1 < "${PATCH_DIR}/behavioral-model-support-venv.patch"
853+
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
856856
./install_deps.sh

‎vm-ubuntu-24.04/install.sh‎

Lines changed: 6 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,7 @@ print_usage() {
2929
1>&2 echo "usage: $0 [ latest | <date> ]"
3030
1>&2 echo ""
3131
1>&2 echo "Dates supported:"
32-
1>&2 echo " 2026-Apr-01"
33-
1>&2 echo " 2026-Mar-01"
34-
1>&2 echo " 2026-Feb-01"
35-
1>&2 echo " 2026-Jan-01"
36-
1>&2 echo " 2025-Nov-01"
37-
1>&2 echo " 2025-Oct-01"
38-
1>&2 echo " 2025-Sep-01"
39-
1>&2 echo " 2025-Aug-01"
32+
1>&2 echo " 2026-May-01"
4033
}
4134

4235
if [ $# -eq 0 ]
@@ -52,53 +45,11 @@ else
5245
fi
5346

5447
case ${VERSION} in
55-
2026-Apr-01)
56-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="392f801e0b4057bbe75ee0e89415b5539882926b"
57-
export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff"
58-
export INSTALL_P4C_SOURCE_VERSION="4536e011b17c00e72749eeaa759d72f4a8d7ce86"
59-
export INSTALL_PTF_SOURCE_VERSION="46da7eb9373216c72bbb4342894416f5448559a0"
60-
;;
61-
2026-Mar-01)
62-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="6c7c93e5484e069c539b5c990bf37c531599894a"
63-
export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff"
64-
export INSTALL_P4C_SOURCE_VERSION="d59f5b2e9bb49e211cfca4831077e3d76f0fb70b"
65-
export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b"
66-
;;
67-
2026-Feb-01)
68-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="4cc1333cd51be5675a9bbeeb432d9b647061a817"
69-
export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff"
70-
export INSTALL_P4C_SOURCE_VERSION="7d367760701056cfa4fe0321f62914c0e79a6214"
71-
export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b"
72-
;;
73-
2026-Jan-01)
74-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="2bdd0b7b2b2ae89faf2720f2158e9842bc6d2dd2"
75-
export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff"
76-
export INSTALL_P4C_SOURCE_VERSION="11d746d94a45694968802675bd9444dfcd029545"
77-
export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b"
78-
;;
79-
2025-Nov-01)
80-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="2bdd0b7b2b2ae89faf2720f2158e9842bc6d2dd2"
81-
export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff"
82-
export INSTALL_P4C_SOURCE_VERSION="a97290474ce3d183b1f6bc4ca4959ebbcdb09b3b"
83-
export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b"
84-
;;
85-
2025-Oct-01)
86-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="68f4a978f465fd76e98fcdecb762981843fb7310"
87-
export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff"
88-
export INSTALL_P4C_SOURCE_VERSION="2265f80459e06a89ffba26cb51c42cc05b1c023e"
89-
export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b"
90-
;;
91-
2025-Sep-01)
92-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="c8081706b38aa6c7e26e8aa78513ac0ac1c17975"
93-
export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff"
94-
export INSTALL_P4C_SOURCE_VERSION="1965b4b523ef5c70e7676145f106ccf9fbba8027"
95-
export INSTALL_PTF_SOURCE_VERSION="346ff01a7b28f7f478130b1eea11e440f1801307"
96-
;;
97-
2025-Aug-01)
98-
export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="4f84a09f217665f84471e8cef74c0b46b873bbe5"
99-
export INSTALL_PI_SOURCE_VERSION="d28b31e4fa05b51f93b9810f5a3ef4a57fbfb8a8"
100-
export INSTALL_P4C_SOURCE_VERSION="4d926d0723c42175c960dd72c762b92de70e5b58"
101-
export INSTALL_PTF_SOURCE_VERSION="6af750831ffe14512c5195383f2b39691744503e"
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"
10253
;;
10354
latest)
10455
echo "Using the latest version of all p4lang repository source code."

vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch renamed to vm-ubuntu-24.04/patches/behavioral-model-support-venv-2026-apr.patch

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
diff --git a/ci/install-nnpy.sh b/ci/install-nnpy.sh
2-
index 558d2a0..b7d0d76 100644
3-
--- a/ci/install-nnpy.sh
4-
+++ b/ci/install-nnpy.sh
5-
@@ -1,3 +1,3 @@
6-
#!/bin/sh
7-
set -e
8-
-sudo pip3 install nnpy cffi
9-
+pip3 install nnpy cffi
101
diff --git a/ci/install-thrift.sh b/ci/install-thrift.sh
112
index 1316476..ea6203c 100644
123
--- a/ci/install-thrift.sh

‎vm-ubuntu-24.04/patches/behavioral-model-support-venv-2026-apr.patch.license‎

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-venv.patch.license‎

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

0 commit comments

Comments
 (0)