From 6898917f41ccb8c265a917fd90b086f879fbf16f Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Thu, 20 Jan 2022 13:51:44 +0100
Subject: [PATCH 1/2] Update components before building release

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 scripts/release.sh           |  8 ++++++++
 scripts/update-components.sh | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100755 scripts/update-components.sh

diff --git a/scripts/release.sh b/scripts/release.sh
index a7c9f131..355d635a 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -51,6 +51,14 @@ else
     targets=${all[@]}
 fi
 
+echo "Updating components"
+${SCRIPTS_DIR}/update-components.sh
+if [[ -n $(git status -s third_party) && ${ALLOW_LOCAL_COMPONENT_CHANGES} != "true" ]]; then
+    echo "ERROR: Building with local component changes."
+    echo "Commit pending changes or rerun with ALLOW_LOCAL_COMPONENT_CHANGES='true'"
+    exit 1
+fi
+
 eval $(${SCRIPTS_DIR}/get-component-versions.sh)
 
 if [[ "${NVIDIA_CONTAINER_TOOLKIT_VERSION}${NVIDIA_CONTAINER_TOOLKIT_TAG:+~${NVIDIA_CONTAINER_TOOLKIT_TAG}}" != "${LIBNVIDIA_CONTAINER_VERSION}" ]]; then
diff --git a/scripts/update-components.sh b/scripts/update-components.sh
new file mode 100755
index 00000000..f8825313
--- /dev/null
+++ b/scripts/update-components.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021, NVIDIA CORPORATION.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e -x
+
+SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../scripts && pwd )"
+PROJECT_ROOT="$( cd ${SCRIPTS_DIR}/.. && pwd )"
+
+git submodule update --init
+
+echo "Component status before update"
+git submodule status
+
+# We update all submodules from their respective remotes
+# NOTE: Appending `-- [PATH]` will limit the update to a specific component
+git submodule update --remote
+
+if [[ -z $(git status -s third_party) ]]; then
+    echo "Components already up to date"
+else
+    echo "Components updated"
+    git submodule status
+fi

From 72e17e86324c0db6f6744b2f80d30b75fb0ba198 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Thu, 27 Jan 2022 18:59:08 +0100
Subject: [PATCH 2/2] Update libnvidia-container submodule

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 third_party/libnvidia-container | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
index b6f85bb4..d48f9b0d 160000
--- a/third_party/libnvidia-container
+++ b/third_party/libnvidia-container
@@ -1 +1 @@
-Subproject commit b6f85bb45e23eae0447999501fe37c07877e9058
+Subproject commit d48f9b0d505fca0aff7c88cee790f9c56aa1b851