From 1e5a6e1fa37b40699616c841b52b259cf64eac50 Mon Sep 17 00:00:00 2001
From: Evan Lezar <7723350-elezar@users.noreply.gitlab.com>
Date: Wed, 26 Apr 2023 10:10:23 +0000
Subject: [PATCH] Merge branch 'revert-kitmaker-workaround' into 'main'

Remove workaround to add libnvidia-container0 to kitmaker archive

See merge request nvidia/container-toolkit/container-toolkit!378
---
 scripts/extract-packages.sh | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/scripts/extract-packages.sh b/scripts/extract-packages.sh
index a98d9bd3..26015594 100755
--- a/scripts/extract-packages.sh
+++ b/scripts/extract-packages.sh
@@ -94,19 +94,6 @@ function extract-all() {
     local dist=$1
 
     echo "Extracting packages for ${dist} from ${PACKAGE_IMAGE}"
-
-    if [ $dist == "ubuntu18.04" ]; then
-        set -x
-        # We need to publish the libnvidia-container0 packages to the kitmaker repository as a once off operation.
-        # We include the packages here so that these will be added to the archive for the ubuntu18.04 arm64 packages.
-        mkdir -p "${ARTIFACTS_DIR}/packages/ubuntu18.04/arm64/"
-        curl -L "https://nvidia.github.io/libnvidia-container/ubuntu18.04/arm64/libnvidia-container0_0.10.0+jetpack_arm64.deb" \
-            --output "${ARTIFACTS_DIR}/packages/ubuntu18.04/arm64/libnvidia-container0_0.10.0+jetpack_arm64.deb"
-        curl -L "https://nvidia.github.io/libnvidia-container/ubuntu18.04/arm64/libnvidia-container0_0.11.0+jetpack_arm64.deb" \
-            --output "${ARTIFACTS_DIR}/packages/ubuntu18.04/arm64/libnvidia-container0_0.11.0+jetpack_arm64.deb"
-        set +x
-    fi
-
     # Extract every file for the specified dist-arch combiniation in MANIFEST.txt
     grep "/${dist}/" "${ARTIFACTS_DIR}/manifest.txt" | while read -r f ; do
         package_name="$(basename "$f")"