From 39d35f36d0959d999fd125b18305fcc88ce6359f Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Wed, 15 Jan 2025 20:18:57 -0500 Subject: [PATCH 1/2] Enable batch-install.sh to run on Ubuntu 22.04 Signed-off-by: Andy Fingerhut --- batch-install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/batch-install.sh b/batch-install.sh index e4f0a063..6f782cfb 100755 --- a/batch-install.sh +++ b/batch-install.sh @@ -29,7 +29,7 @@ THIS_SCRIPT_DIR_ABSOLUTE=`readlink -f "${THIS_SCRIPT_DIR_MAYBE_RELATIVE}"` linux_version_warning() { 1>&2 echo "Found ID ${ID} and VERSION_ID ${VERSION_ID} in /etc/os-release" 1>&2 echo "This script only supports these:" - 1>&2 echo " ID ubuntu, VERSION_ID in 20.04" + 1>&2 echo " ID ubuntu, VERSION_ID in 20.04 22.04" 1>&2 echo "" 1>&2 echo "Proceed installing manually at your own risk of" 1>&2 echo "significant time spent figuring out how to make it all" @@ -56,6 +56,9 @@ then 20.04) supported_distribution=1 ;; + 22.04) + supported_distribution=1 + ;; esac fi From 0210472ed15db3f02ec3fc941d1a24fb1a6f1766 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Wed, 29 Jan 2025 00:24:16 -0500 Subject: [PATCH 2/2] Re-enable P4-14 build Signed-off-by: Andy Fingerhut --- p4studio/profiles/testing.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/p4studio/profiles/testing.yaml b/p4studio/profiles/testing.yaml index 8d239463..bfb65968 100644 --- a/p4studio/profiles/testing.yaml +++ b/p4studio/profiles/testing.yaml @@ -9,8 +9,7 @@ features: grpc: true thrift-driver: true p4-examples: - # FIXME: broken - # - p4-14-programs + - p4-14-programs - p4-16-programs switch: profile: x2_tofino