Merge branch 'al2-aarch64' into 'master'

Evan Lezar · Evan Lezar · commit 266b752b02e9 · 2021-10-19T14:31:51.000Z
Add aarch64 build for Amazon Linux 2

See merge request nvidia/container-toolkit/container-toolkit!55
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 <cudatools@nvidia.com>  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 <cudatools@nvidia.com> 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 <cudatools@nvidia.com> 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
@@ -1 +1 @@
-Subproject commit d78f1f4afa7e8d809434e71cf717f0817a450b37
+Subproject commit 1fa138a694b3667fd89ac89dfdb26fcd06ab0bb9
diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime
@@ -1 +1 @@
-Subproject commit 2e721ab3b2202470e940fd5a29c1f681e761fbf0
+Subproject commit cd6aef41126b5409c2329b66803b278a697aaaf3
diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker
@@ -1 +1 @@
-Subproject commit 52ed1032c80be535c44822f67151a4b0a0e72658
+Subproject commit 4613cdae34c3e106ef124c9b86e4cf998569bbd6

-Original file line number
+Diff line change
@@ @@ -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