From 2c4ceafe10848d22665081bc872b89f827418e6a Mon Sep 17 00:00:00 2001
From: Jonathan Moss <2729151+jwmoss@users.noreply.github.com>
Date: Fri, 27 Sep 2024 15:06:51 -0400
Subject: [PATCH] Add python3-zstandard in place of the pip package

---
 gcp.pkr.hcl                                                    | 3 +--
 .../linux/ubuntu-2404-amd64-gui/fxci/02-additional-packages.sh | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcp.pkr.hcl b/gcp.pkr.hcl
index e4162a4..9d28be0 100644
--- a/gcp.pkr.hcl
+++ b/gcp.pkr.hcl
@@ -232,8 +232,7 @@ build {
     expect_disconnect = true
     scripts = [
       "${path.cwd}/scripts/linux/ubuntu-2404-amd64-gui/community/01-bootstrap.sh",
-      "${path.cwd}/scripts/linux/ubuntu-2404-amd64-gui/fxci/02-additional-packages.sh",
-      "${path.cwd}/scripts/linux/ubuntu-2404-amd64-gui/fxci/03-additional-pips.sh"
+      "${path.cwd}/scripts/linux/ubuntu-2404-amd64-gui/fxci/02-additional-packages.sh"
     ]
   }
 
diff --git a/scripts/linux/ubuntu-2404-amd64-gui/fxci/02-additional-packages.sh b/scripts/linux/ubuntu-2404-amd64-gui/fxci/02-additional-packages.sh
index c61cfac..d721136 100644
--- a/scripts/linux/ubuntu-2404-amd64-gui/fxci/02-additional-packages.sh
+++ b/scripts/linux/ubuntu-2404-amd64-gui/fxci/02-additional-packages.sh
@@ -34,7 +34,8 @@ MISC_PACKAGES+=(build-essential curl git gnupg-agent jq mercurial)
 MISC_PACKAGES+=(python3-pip python3-certifi python3-psutil)
 # zstd packages
 MISC_PACKAGES+=(zstd python3-zstd)
-# things helpful for apt
+# install zstandard to avoid installing via pip and breaking via PEP 668 https://peps.python.org/pep-0668/ 
+MISC_PACKAGES+=(python3-zstandard)
 MISC_PACKAGES+=(apt-transport-https ca-certificates software-properties-common)
 # docker-worker needs this for unpacking lz4 images, perhaps uneeded but shouldn't hurt
 MISC_PACKAGES+=(liblz4-tool)