scottk/tegra-demo-distro
1
0
Fork 0
mirror of https://github.com/lingble/tegra-demo-distro.git synced 2025-11-02 05:28:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

setup-env*: drop reference to NVIDIA_DEVNET_MIRROR

Browse Source 
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>
This commit is contained in:
Ilies CHERGUI
2021-04-25 16:07:43 +01:00
committed by Matt Madison
parent df0ec2701a
commit 181cde43f1
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts-setup/setup-env-internal
View File

@@ -134,20 +134,6 @@ else
COLOR=never COLOR=never
fi 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 cat <<EOF
BDIR="$BUILDDIR" BDIR="$BUILDDIR"
TD_COLOR="$COLOR" TD_COLOR="$COLOR"
@@ -155,8 +141,7 @@ TD_NEEDSETUP=$NEEDSETUP
TD_DISTRO=$DISTRO TD_DISTRO=$DISTRO
TD_MACHINE=$MACHINE TD_MACHINE=$MACHINE
TD_LAYERPATH=$LAYERPATH TD_LAYERPATH=$LAYERPATH
TD_DEVNET_MIRROR="$TD_DEVNET_MIRROR"
TD_RC=0 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 EOF
exit 0 exit 0

9
setup-env
View File

@@ -96,20 +96,11 @@ if [ -n "$TD_NEEDSETUP" ]; then
# Replace placeholder comments with default settings # Replace placeholder comments with default settings
sed -e"/@TD_SETUP_MACHINE@/c \MACHINE ?= \"$TD_MACHINE\"" \ sed -e"/@TD_SETUP_MACHINE@/c \MACHINE ?= \"$TD_MACHINE\"" \
-e"/@TD_SETUP_DISTRO@/c \DISTRO ?= \"$TD_DISTRO\"" -i "$BUILDDIR/conf/local.conf" -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 cat <<EOF
Your build environment has been configured with: Your build environment has been configured with:
MACHINE=$TD_MACHINE MACHINE=$TD_MACHINE
DISTRO=$TD_DISTRO DISTRO=$TD_DISTRO
$devnet_info__
EOF EOF
for s__ in .oe/$TD_DISTRO .yocto/$TD_DISTRO .oe .yocto ; do for s__ in .oe/$TD_DISTRO .yocto/$TD_DISTRO .oe .yocto ; do
if [ -e "$HOME/$s__/site.conf" ]; then if [ -e "$HOME/$s__/site.conf" ]; then