Merge branch 'al2-aarch64' into 'master'

Add aarch64 build for Amazon Linux 2 See merge request nvidia/container-toolkit/container-toolkit!55
NVIDIA · Oct 19, 2021 · 266b752 · 266b752
2 parents a036a83 + 7fc33d0
commit 266b752
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/docker/docker.mk b/docker/docker.mk
@@ -17,7 +17,7 @@ AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
 X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux1 amazonlinux2 opensuse-leap15.1
 PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8
 ARM64_TARGETS := ubuntu20.04 ubuntu18.04
-AARCH64_TARGETS := centos8 rhel8
+AARCH64_TARGETS := centos8 rhel8 amazonlinux2
 
 # Define top-level build targets
 docker%: SHELL:=/bin/bash

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,5 +1,6 @@
 nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium
 
+  * Add AARCH64 package for Amazon Linux 2
   * Include nvidia-container-runtime into nvidia-container-toolkit package
 
  -- NVIDIA CORPORATION <[email protected]>  Mon, 06 Sep 2021 12:24:05 +0200

diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
@@ -66,6 +66,7 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
 %changelog
 * Mon Sep 06 2021 NVIDIA CORPORATION <[email protected]> 1.6.0-0.1.rc.1
 
+- Add AARCH64 package for Amazon Linux 2
 - Include nvidia-container-runtime into nvidia-container-toolkit package
 
 * Mon Jun 14 2021 NVIDIA CORPORATION <[email protected]> 1.5.1-1

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -29,6 +29,7 @@ PROJECT_ROOT="$( cd ${SCRIPTS_DIR}/.. && pwd )"
 # can be overridden by specifying command line arguments.
 all=(
     amazonlinux1-x86_64
+    amazonlinux2-aarch64
     amazonlinux2-x86_64
     centos7-ppc64le
     centos7-x86_64

diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime
diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker