From 39d35f36d0959d999fd125b18305fcc88ce6359f Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Wed, 15 Jan 2025 20:18:57 -0500 Subject: [PATCH 1/3] 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 e4f0a063c..6f782cfb9 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 9d77e1c3fd527b2344496dfb7de4381f34d90f8e Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Wed, 29 Jan 2025 08:52:05 -0500 Subject: [PATCH 2/3] Re-enable build of bf-diags Signed-off-by: Andy Fingerhut --- p4studio/profiles/testing.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/p4studio/profiles/testing.yaml b/p4studio/profiles/testing.yaml index bfb65968f..8b189ea79 100644 --- a/p4studio/profiles/testing.yaml +++ b/p4studio/profiles/testing.yaml @@ -1,8 +1,7 @@ global-options: {} features: - # FIXME: broken - # bf-diags: - # thrift-diags: true + bf-diags: + thrift-diags: true drivers: bfrt: true bfrt-generic-flags: true From d151af9d8cba9d5043ef1e21a7ed6d47567b9eb6 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Wed, 29 Jan 2025 12:56:54 -0500 Subject: [PATCH 3/3] Enable bf-diags and tofino, but disable tofino2 Signed-off-by: Andy Fingerhut --- p4studio/profiles/testing.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/p4studio/profiles/testing.yaml b/p4studio/profiles/testing.yaml index 8b189ea79..dfe8e6459 100644 --- a/p4studio/profiles/testing.yaml +++ b/p4studio/profiles/testing.yaml @@ -16,4 +16,5 @@ features: thrift-switch: true architectures: - tofino - - tofino2 + # Cannot enble all of bf-diags, tofino, and tofino2 in same build. + # - tofino2