From 57a363f655b0d0b4c9a4c8cdd4005a36b79484d2 Mon Sep 17 00:00:00 2001
From: Alexandru Costache <alexandru@balena.io>
Date: Thu, 29 Aug 2024 15:10:59 +0300
Subject: [PATCH] Jetson Orin: Update CUDA installation example

... to allow for installing packages without
prompting during docker builds.

Re-mounting / and /lib/firmware is necessary
if cuda is being installed manually from a container,
but is not needed during docker builds.

Change-type: patch
Signed-off-by: Alexandru Costache <alexandru@balena.io>
---
 jetson-agx-orin-devkit/Dockerfile          | 2 +-
 jetson-orin-nano-devkit-nvme/Dockerfile    | 2 +-
 jetson-orin-nx-xavier-nx-devkit/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jetson-agx-orin-devkit/Dockerfile b/jetson-agx-orin-devkit/Dockerfile
index 4b9860c..1c97523 100644
--- a/jetson-agx-orin-devkit/Dockerfile
+++ b/jetson-agx-orin-devkit/Dockerfile
@@ -63,7 +63,7 @@ RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
 #   && ldconfig
 
 ## Optional: Sample CUDA Clock sample run in webterminal:
-##  apt-get update && apt-get install -y nvidia-l4t-cuda nvidia-cuda build-essential cuda-nvcc-12-2 && git clone https://github.com/NVIDIA/cuda-samples.git && cd cuda-samples/Samples/1_Utilities/deviceQuery && make && ./deviceQuery
+##  apt-get update && apt-get install -y -o Dpkg::Options::="--force-confdef" nvidia-l4t-cuda nvidia-cuda build-essential cuda-nvcc-12-2 && git clone https://github.com/NVIDIA/cuda-samples.git && cd cuda-samples/Samples/1_Utilities/deviceQuery && make && ./deviceQuery
 ##  Example Output:
 ##
 ##./deviceQuery Starting...
diff --git a/jetson-orin-nano-devkit-nvme/Dockerfile b/jetson-orin-nano-devkit-nvme/Dockerfile
index 6efcb39..8ec10bc 100644
--- a/jetson-orin-nano-devkit-nvme/Dockerfile
+++ b/jetson-orin-nano-devkit-nvme/Dockerfile
@@ -63,7 +63,7 @@ RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
 #   && ldconfig
 
 ## Optional: Sample CUDA Clock sample run in webterminal:
-##  apt-get update && apt-get install -y nvidia-l4t-cuda nvidia-cuda build-essential cuda-nvcc-12-2 && git clone https://github.com/NVIDIA/cuda-samples.git && cd cuda-samples/Samples/1_Utilities/deviceQuery && make && ./deviceQuery
+##  apt-get update && apt-get install -y -o Dpkg::Options::="--force-confdef" nvidia-l4t-cuda nvidia-cuda build-essential cuda-nvcc-12-2 && git clone https://github.com/NVIDIA/cuda-samples.git && cd cuda-samples/Samples/1_Utilities/deviceQuery && make && ./deviceQuery
 ##  Example Output:
 ##
 ##./deviceQuery Starting...
diff --git a/jetson-orin-nx-xavier-nx-devkit/Dockerfile b/jetson-orin-nx-xavier-nx-devkit/Dockerfile
index 0383131..e487ce4 100644
--- a/jetson-orin-nx-xavier-nx-devkit/Dockerfile
+++ b/jetson-orin-nx-xavier-nx-devkit/Dockerfile
@@ -63,7 +63,7 @@ RUN echo "#!/bin/bash" > /etc/X11/xinit/xserverrc \
 #   && ldconfig
 
 ## Optional: Sample CUDA Clock sample run in webterminal:
-##  apt-get update && apt-get install -y nvidia-l4t-cuda nvidia-cuda build-essential cuda-nvcc-12-2 && git clone https://github.com/NVIDIA/cuda-samples.git && cd cuda-samples/Samples/1_Utilities/deviceQuery && make && ./deviceQuery
+##  apt-get update && apt-get install -y -o Dpkg::Options::="--force-confdef" nvidia-l4t-cuda nvidia-cuda build-essential cuda-nvcc-12-2 && git clone https://github.com/NVIDIA/cuda-samples.git && cd cuda-samples/Samples/1_Utilities/deviceQuery && make && ./deviceQuery
 ##  Example Output:
 ##
 ##./deviceQuery Starting...