diff --git a/vm-ubuntu-24.04/install-p4dev-v8.sh b/vm-ubuntu-24.04/install-p4dev-v8.sh index ec384e9d..3165a970 100755 --- a/vm-ubuntu-24.04/install-p4dev-v8.sh +++ b/vm-ubuntu-24.04/install-p4dev-v8.sh @@ -411,7 +411,7 @@ echo "+ behavioral-model: github.com/p4lang/behavioral-model latest version" echo " which, as of 2023-Sep-22, also installs these things:" echo " + thrift version 0.16.0" echo " + nanomsg version 1.0.0" -echo " + nnpy latest version available via 'pip install'" +echo " + pynng version 0.9.0" echo "+ p4c: github.com/p4lang/p4c latest version" echo "+ ptf: github.com/p4lang/ptf latest version" echo "+ Mininet: github.com/mininet/mininet latest version as of 2024-Sep-18" @@ -850,7 +850,7 @@ else TIME_BEHAVIORAL_MODEL_INSTALL_START=$(date +%s) PATCH_DIR="${THIS_SCRIPT_DIR_ABSOLUTE}/patches" patch -p1 < "${PATCH_DIR}/behavioral-model-support-fedora.patch" - patch -p1 < "${PATCH_DIR}/behavioral-model-support-venv.patch" + patch -p1 < "${PATCH_DIR}/behavioral-model-support-venv-2026-apr.patch" # This command installs Thrift, which I want to include in my build of # simple_switch_grpc ./install_deps.sh diff --git a/vm-ubuntu-24.04/install.sh b/vm-ubuntu-24.04/install.sh index c5b762a3..e78cfa92 100755 --- a/vm-ubuntu-24.04/install.sh +++ b/vm-ubuntu-24.04/install.sh @@ -29,14 +29,7 @@ print_usage() { 1>&2 echo "usage: $0 [ latest | ]" 1>&2 echo "" 1>&2 echo "Dates supported:" - 1>&2 echo " 2026-Apr-01" - 1>&2 echo " 2026-Mar-01" - 1>&2 echo " 2026-Feb-01" - 1>&2 echo " 2026-Jan-01" - 1>&2 echo " 2025-Nov-01" - 1>&2 echo " 2025-Oct-01" - 1>&2 echo " 2025-Sep-01" - 1>&2 echo " 2025-Aug-01" + 1>&2 echo " 2026-May-01" } if [ $# -eq 0 ] @@ -52,53 +45,11 @@ else fi case ${VERSION} in - 2026-Apr-01) - export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="392f801e0b4057bbe75ee0e89415b5539882926b" - export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff" - export INSTALL_P4C_SOURCE_VERSION="4536e011b17c00e72749eeaa759d72f4a8d7ce86" - export INSTALL_PTF_SOURCE_VERSION="46da7eb9373216c72bbb4342894416f5448559a0" - ;; - 2026-Mar-01) - export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="6c7c93e5484e069c539b5c990bf37c531599894a" - export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff" - export INSTALL_P4C_SOURCE_VERSION="d59f5b2e9bb49e211cfca4831077e3d76f0fb70b" - export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b" - ;; - 2026-Feb-01) - export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="4cc1333cd51be5675a9bbeeb432d9b647061a817" - export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff" - export INSTALL_P4C_SOURCE_VERSION="7d367760701056cfa4fe0321f62914c0e79a6214" - export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b" - ;; - 2026-Jan-01) - export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="2bdd0b7b2b2ae89faf2720f2158e9842bc6d2dd2" - export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff" - export INSTALL_P4C_SOURCE_VERSION="11d746d94a45694968802675bd9444dfcd029545" - export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b" - ;; - 2025-Nov-01) - export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="2bdd0b7b2b2ae89faf2720f2158e9842bc6d2dd2" - export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff" - export INSTALL_P4C_SOURCE_VERSION="a97290474ce3d183b1f6bc4ca4959ebbcdb09b3b" - export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b" - ;; - 2025-Oct-01) - export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="68f4a978f465fd76e98fcdecb762981843fb7310" - export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff" - export INSTALL_P4C_SOURCE_VERSION="2265f80459e06a89ffba26cb51c42cc05b1c023e" - export INSTALL_PTF_SOURCE_VERSION="05f46c3873feb2213df29743be3d9a9e34d5559b" - ;; - 2025-Sep-01) - export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="c8081706b38aa6c7e26e8aa78513ac0ac1c17975" - export INSTALL_PI_SOURCE_VERSION="5689c91a8a7423781267b27d8b166c49a53904ff" - export INSTALL_P4C_SOURCE_VERSION="1965b4b523ef5c70e7676145f106ccf9fbba8027" - export INSTALL_PTF_SOURCE_VERSION="346ff01a7b28f7f478130b1eea11e440f1801307" - ;; - 2025-Aug-01) - export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="4f84a09f217665f84471e8cef74c0b46b873bbe5" - export INSTALL_PI_SOURCE_VERSION="d28b31e4fa05b51f93b9810f5a3ef4a57fbfb8a8" - export INSTALL_P4C_SOURCE_VERSION="4d926d0723c42175c960dd72c762b92de70e5b58" - export INSTALL_PTF_SOURCE_VERSION="6af750831ffe14512c5195383f2b39691744503e" + 2026-May-01) + export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="08bba268ecf3c92e53778b9605696c1e2c46d9e8" + export INSTALL_PI_SOURCE_VERSION="51805c0108cb49e85e4812dd05bb6693b1f48f85" + export INSTALL_P4C_SOURCE_VERSION="fe95abfa3318512732776a1ad0aa83b4f2192216" + export INSTALL_PTF_SOURCE_VERSION="c67ca73692fb1ec23e0b11c7f5b03f1633da09a2" ;; latest) echo "Using the latest version of all p4lang repository source code." diff --git a/vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch b/vm-ubuntu-24.04/patches/behavioral-model-support-venv-2026-apr.patch similarity index 85% rename from vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch rename to vm-ubuntu-24.04/patches/behavioral-model-support-venv-2026-apr.patch index 06221fd8..e7a92c81 100644 --- a/vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch +++ b/vm-ubuntu-24.04/patches/behavioral-model-support-venv-2026-apr.patch @@ -1,12 +1,3 @@ -diff --git a/ci/install-nnpy.sh b/ci/install-nnpy.sh -index 558d2a0..b7d0d76 100644 ---- a/ci/install-nnpy.sh -+++ b/ci/install-nnpy.sh -@@ -1,3 +1,3 @@ - #!/bin/sh - set -e --sudo pip3 install nnpy cffi -+pip3 install nnpy cffi diff --git a/ci/install-thrift.sh b/ci/install-thrift.sh index 1316476..ea6203c 100644 --- a/ci/install-thrift.sh diff --git a/vm-ubuntu-24.04/patches/behavioral-model-support-venv-2026-apr.patch.license b/vm-ubuntu-24.04/patches/behavioral-model-support-venv-2026-apr.patch.license new file mode 100644 index 00000000..5157373f --- /dev/null +++ b/vm-ubuntu-24.04/patches/behavioral-model-support-venv-2026-apr.patch.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2026 Andy Fingerhut + +SPDX-License-Identifier: Apache-2.0 diff --git a/vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch.license b/vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch.license deleted file mode 100644 index ce6f24cf..00000000 --- a/vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2024 Andy Fingerhut - -SPDX-License-Identifier: Apache-2.0