Get 32.2 sources

Author: jetsonhacks

README.md

@@ -1,4 +1,4 @@
 # buildKernelAndModules
 Build the Linux Kernel and Modules on board the NVIDIA Jetson Nano Developer Kit
 
-Work in progress
+command 2>&1 | tee log.txt

getKernelSources.sh

@@ -3,31 +3,50 @@
 # Copyright (c) 2016-19 Jetsonhacks 
 # MIT License
 
-JETSON_MODEL="jetson-nano"
-L4T_TARGET="32.1.0"
+JETSON_MODEL="NVIDIA Jetson Nano Developer Kit"
+L4T_TARGET="32.2"
 SOURCE_TARGET="/usr/src"
 KERNEL_RELEASE="4.9"
 
 # < is more efficient than cat command
 # NULL byte at end of board description gets bash upset; strip it out
 JETSON_BOARD=$(tr -d '\0' </proc/device-tree/model)
+echo "Jetson Model: "$JETSON_BOARD
 
 JETSON_L4T=""
-if [ -f /etc/nv_tegra_release ]; then
-    # L4T string
-    JETSON_L4T_STRING=$(head -n 1 /etc/nv_tegra_release)
-
-    # Load release and revision
-    JETSON_L4T_RELEASE=$(echo $JETSON_L4T_STRING | cut -f 1 -d ',' | sed 's/\# R//g' | cut -d ' ' -f1)
-    JETSON_L4T_REVISION=$(echo $JETSON_L4T_STRING | cut -f 2 -d ',' | sed 's/\ REVISION: //g' )
-    # unset variable
-    unset JETSON_L4T_STRING
-    
-    # Write Jetson description
-    JETSON_L4T="$JETSON_L4T_RELEASE.$JETSON_L4T_REVISION"
-fi
-echo "Jetson Model: "$JETSON_BOARD
-echo "Jetson L4T: "$JETSON_L4T
+
+function check_L4T_version()
+{
+	JETSON_L4T_STRING=$(head -n 1 /etc/nv_tegra_release)
+
+	if [ -z $2 ]; then
+		echo "$LOG Instead, reading L4T version from \"dpkg-query --show nvidia-l4t-core\""
+
+		JETSON_L4T_STRING=$(dpkg-query --showformat='${Version}' --show nvidia-l4t-core)
+		local JETSON_L4T_ARRAY=(${JETSON_L4T_STRING//./ })	
+
+		#echo ${JETSON_L4T_ARRAY[@]}
+		#echo ${#JETSON_L4T_ARRAY[@]}
+
+		JETSON_L4T_RELEASE=${JETSON_L4T_ARRAY[0]}
+		JETSON_L4T_REVISION=${JETSON_L4T_ARRAY[1]}
+	else
+		echo "$LOG reading L4T version from /etc/nv_tegra_release"
+
+		JETSON_L4T_RELEASE=$(echo $JETSON_L4T_STRING | cut -f 2 -d ' ' | grep -Po '(?<=R)[^;]+')
+		JETSON_L4T_REVISION=$(echo $JETSON_L4T_STRING | cut -f 2 -d ',' | grep -Po '(?<=REVISION: )[^;]+')
+	fi
+
+	JETSON_L4T_VERSION="$JETSON_L4T_RELEASE.$JETSON_L4T_REVISION"
+	echo "$LOG Jetson BSP Version:  L4T R$JETSON_L4T_VERSION"
+
+}
+
+echo "Getting L4T Version"
+check_L4T_version
+JETSON_L4T="$JETSON_L4T_RELEASE.$JETSON_L4T_REVISION"
+echo "Jetson_L4T="$JETSON_L4T
+unset JETSON_L4T_STRING
 
 function usage
 {

scripts/getKernelSources.sh

@@ -4,7 +4,7 @@ apt-add-repository universe
 apt-get update
 apt-get install pkg-config -y
 # We use 'make menuconfig' to edit the .config file; install dependencies
-apt-get install libncurses5-dev
+apt-get install libncurses5-dev -y
 echo "Installing kernel sources in: ""$SOURCE_TARGET"
 if [ ! -d "$SOURCE_TARGET" ]; then
    # Target directory does not exist; create
@@ -15,9 +15,9 @@ fi
 cd "$SOURCE_TARGET"
 echo "$PWD"
 
-wget -N https://developer.nvidia.com/embedded/dlc/l4t-sources-32-1-jetson-nano
+wget -N https://developer.download.nvidia.com/embedded/L4T/r32-2_Release_v1.0/Nano-TX1/public_sources.tbz2
 # l4t-sources is a tbz2 file
-tar -xvf l4t-sources-32-1-jetson-nano public_sources/kernel_src.tbz2
+tar -xvf public_sources.tbz2 public_sources/kernel_src.tbz2
 tar -xvf public_sources/kernel_src.tbz2
 # Space is tight; get rid of the compressed kernel source
 rm -r public_sources
@@ -28,10 +28,12 @@ zcat /proc/config.gz > .config
 cp .config config.orig
 # Default to the current local version
 KERNEL_VERSION=$(uname -r)
-# For L4T 32.1.0 the kernel is 4.9.140-tegra ; 
+# For L4T 32.2 the kernel is 4.9.140-tegra ; 
 # Everything after '4.9.140' is the local version
 # This removes the suffix
 LOCAL_VERSION=${KERNEL_VERSION#$"4.9.140"}
+# FIX ME
+LOCAL_VERSION="-jetsonbot"
 # Should be "-tegra"
 bash scripts/config --file .config \
 	--set-str LOCALVERSION $LOCAL_VERSION

scripts/makeKernel.sh

@@ -8,7 +8,7 @@ echo "Source Target: "$SOURCE_TARGET
 MAKE_DIRECTORY="$SOURCE_TARGET"kernel/kernel-4.9
 
 cd "$SOURCE_TARGET"kernel/kernel-4.9
-make prepare
+# make prepare
 # Get the number of CPUs 
 NUM_CPU=$(nproc)