From 181cde43f128c743dc60bd872ba74b954b2d3af2 Mon Sep 17 00:00:00 2001
From: Ilies CHERGUI <ilies.chergui@gmail.com>
Date: Sun, 25 Apr 2021 16:07:43 +0100
Subject: [PATCH] setup-env*: drop reference to NVIDIA_DEVNET_MIRROR

as we are no longer depending on the Nvidia SDK manager Downloads.

Signed-off-by: Ilies CHERGUI <ilies.chergui@gmail.com>
Signed-off-by: Matt Madison <matt@madison.systems>
---
 scripts-setup/setup-env-internal | 17 +----------------
 setup-env                        |  9 ---------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/scripts-setup/setup-env-internal b/scripts-setup/setup-env-internal
index fb7edb9..bbf002b 100755
--- a/scripts-setup/setup-env-internal
+++ b/scripts-setup/setup-env-internal
@@ -134,20 +134,6 @@ else
     COLOR=never
 fi
 
-[ "$NVIDIA_DEVNET_MIRROR" != "" ] || NVIDIA_DEVNET_MIRROR="$HOME/Downloads/nvidia/sdkm_downloads"
-if echo "$NVIDIA_DEVNET_MIRROR" | grep -Eq "^[^:]+://"; then
-    TD_DEVNET_MIRROR="$NVIDIA_DEVNET_MIRROR"
-    if [ "${NVIDIA_DEVNET_MIRROR:0:7}" = "file://" ]; then
-	if [ ! -d "${NVIDIA_DEVNET_MIRROR:7}" ]; then
-	    TD_DEVNET_MIRROR=
-	fi
-    fi
-else
-    TD_DEVNET_MIRROR="file://$NVIDIA_DEVNET_MIRROR"
-    if [ ! -d "$NVIDIA_DEVNET_MIRROR" ]; then
-	TD_DEVNET_MIRROR=
-    fi
-fi
 cat <<EOF
 BDIR="$BUILDDIR"
 TD_COLOR="$COLOR"
@@ -155,8 +141,7 @@ TD_NEEDSETUP=$NEEDSETUP
 TD_DISTRO=$DISTRO
 TD_MACHINE=$MACHINE
 TD_LAYERPATH=$LAYERPATH
-TD_DEVNET_MIRROR="$TD_DEVNET_MIRROR"
 TD_RC=0
-TD_VARS="\$TD_VARS TD_COLOR TD_NEEDSETUP TD_DISTRO TD_MACHINE TD_LAYERPATH TD_DEVNET_MIRROR"
+TD_VARS="\$TD_VARS TD_COLOR TD_NEEDSETUP TD_DISTRO TD_MACHINE TD_LAYERPATH"
 EOF
 exit 0
diff --git a/setup-env b/setup-env
index 5f07f3a..133b889 100644
--- a/setup-env
+++ b/setup-env
@@ -96,20 +96,11 @@ if [ -n "$TD_NEEDSETUP" ]; then
     # Replace placeholder comments with default settings
     sed -e"/@TD_SETUP_MACHINE@/c \MACHINE ?= \"$TD_MACHINE\"" \
         -e"/@TD_SETUP_DISTRO@/c \DISTRO ?= \"$TD_DISTRO\"" -i "$BUILDDIR/conf/local.conf"
-    if [ -n "$TD_DEVNET_MIRROR" ]; then
-	sed -e"/@TD_SETUP_DEVNET_MIRROR@/c \NVIDIA_DEVNET_MIRROR ?= \"$TD_DEVNET_MIRROR\"" \
-	    -i "$BUILDDIR/conf/local.conf"
-	devnet_info__="NVIDIA_DEVNET_MIRROR=$TD_DEVNET_MIRROR"
-    else
-	sed -e"/@TD_SETUP_DEVNET_MIRROR@/d" -i "$BUILDDIR/conf/local.conf"
-	devnet_info__="(no setting for NVIDIA_DEVNET_MIRROR)"
-    fi
     cat <<EOF
 
 Your build environment has been configured with:
     MACHINE=$TD_MACHINE
     DISTRO=$TD_DISTRO
-    $devnet_info__
 EOF
     for s__ in .oe/$TD_DISTRO .yocto/$TD_DISTRO .oe .yocto ; do
         if [ -e "$HOME/$s__/site.conf" ]; then