Update to L4T 28.2.1

Author: jetsonhacks

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Jetsonhacks
+Copyright (c) 2017-18 Jetsonhacks
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -34,10 +34,17 @@ Removes all of the kernel sources and compressed source files. You may want to m
 The copyImage.sh script copies the Image to the current device. If you are building the kernel on an external device, for example a SSD, you will probably want to copy the Image file over to the eMMC in the eMMC's /boot directory. The Jetson will usually try to boot from the eMMC before switching to a different device. Study the boot sequence of the Jetson to properly understand which Image file is being used.
 
 
-Special thanks to Raffaello Bonghi (https://github.com/rbonghi) for jeston_easy scripts.
-
+Special thanks to Raffaello Bonghi (https://github.com/rbonghi) for jetson_easy scripts.
+Special thanks to Shreeyak (https://github.com/Shreeyak) for discussing alternatives to get source directly from NVIDIA git repositories.
 
 ### Release Notes
+July, 2018
+* vL4T28.2.1
+* L4T 28.2.1 (JetPack 3.2.1)
+* Fix issue with scripts jetson_variables to determine L4T version. 
+** Special thanks to Shreeyak (https://github.com/Shreeyak)
+* Refactored scripts/getKernelSources and getKernelSourcesNoGUI
+
 April, 2018
 * vL4T28.2r3
 * L4T 28.2 (JetPack 3.2)

getKernelSources.sh

@@ -7,7 +7,7 @@ echo "$JETSON_DESCRIPTION"
 echo "Jetpack $JETSON_JETPACK [L4T $JETSON_L4T]"
 
 # Check to make sure we're installing the correct kernel sources
-L4TTarget="28.2"
+L4TTarget="28.2.1"
 if [ $JETSON_L4T == $L4TTarget ] ; then
    echo "Getting kernel sources"
    sudo ./scripts/getKernelSources.sh

getKernelSourcesNoGUI.sh

@@ -7,7 +7,7 @@ echo "$JETSON_DESCRIPTION"
 echo "Jetpack $JETSON_JETPACK [L4T $JETSON_L4T]"
 
 # Check to make sure we're installing the correct kernel sources
-L4TTarget="28.2"
+L4TTarget="28.2.1"
 if [ $JETSON_L4T == $L4TTarget ] ; then
    echo "Getting kernel sources"
    sudo ./scripts/getKernelSourcesNoGUI.sh

scripts/getKernelSources.sh

@@ -1,16 +1,8 @@
 #!/bin/bash
-apt-add-repository universe
-apt-get update
-apt-get install qt5-default pkg-config -y
-cd /usr/src
-wget -N http://developer.download.nvidia.com/embedded/L4T/r28_Release_v2.0/GA/BSP/tx2_sources.tbz2
-sudo tar -xvf tx2_sources.tbz2 public_release/kernel_src.tbz2
-tar -xvf public_release/kernel_src.tbz2
-# Space is tight; get rid of the compressed kernel source
-rm -r public_release
-cd kernel/kernel-4.4
-# Go get the default config file; this becomes the new system configuration
-zcat /proc/config.gz > .config
-# Ready to configure kernel
+# Get the source ;
+source scripts/getKernelSourcesNoGUI.sh
+# We use QT 5 for the configuration GUI
+apt-get install qt5-default -y
+cd /usr/src/kernel/kernel-4.4
 make xconfig
 

scripts/getKernelSourcesNoGUI.sh

@@ -3,8 +3,8 @@ apt-add-repository universe
 apt-get update
 apt-get install pkg-config -y
 cd /usr/src
-wget -N http://developer.download.nvidia.com/embedded/L4T/r28_Release_v2.0/GA/BSP/tx2_sources.tbz2
-sudo tar -xvf tx2_sources.tbz2 public_release/kernel_src.tbz2
+wget -N https://developer.download.nvidia.com/embedded/L4T/r28_Release_v2.1/public_sources.tbz2
+sudo tar -xvf public_sources.tbz2 public_release/kernel_src.tbz2
 tar -xvf public_release/kernel_src.tbz2
 # Space is tight; get rid of the compressed kernel source
 rm -r public_release

scripts/jetson_variables.sh

@@ -45,6 +45,7 @@ if [ -f /sys/module/tegra_fuse/parameters/tegra_chip_id ]; then
     esac
     JETSON_DESCRIPTION="NVIDIA Jetson $JETSON_BOARD"
 fi
+export JETSON_BOARD
 
 # NVIDIA Jetson version
 # reference https://devtalk.nvidia.com/default/topic/860092/jetson-tk1/how-do-i-know-what-version-of-l4t-my-jetson-tk1-is-running-/
@@ -54,7 +55,7 @@ if [ -f /etc/nv_tegra_release ]; then
 
     # 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' | cut -d. -f1)
+    JETSON_L4T_REVISION=$(echo $JETSON_L4T_STRING | cut -f 2 -d ',' | sed 's/\ REVISION: //g' )
     # unset variable
     unset JETSON_L4T_STRING
 
@@ -65,13 +66,17 @@ if [ -f /etc/nv_tegra_release ]; then
     # https://developer.nvidia.com/embedded/jetpack-archive
     if [ "$JETSON_BOARD" = "TX2i" ] ; then 
         case $JETSON_L4T in
+            "28.2.1")
+                    JETSON_JETPACK="3.2.1" ;;
             "28.2") 
                JETSON_JETPACK="3.2" ;;
             *)
                JETSON_JETPACK="UNKNOWN" ;;
         esac        
     elif [ "$JETSON_BOARD" = "TX2" ] ; then
         case $JETSON_L4T in
+            "28.2.1")
+                    JETSON_JETPACK="3.2.1" ;;
             "28.2") 
                     JETSON_JETPACK="3.2" ;;
             "28.1") 
@@ -84,7 +89,7 @@ if [ -f /etc/nv_tegra_release ]; then
     elif [ "$JETSON_BOARD" = "TX1" ] ; then
         case $JETSON_L4T in
             "28.2") 
-                    JETSON_JETPACK="3.2" ;;
+                    JETSON_JETPACK="3.2 or 3.2.1" ;;
             "28.1") 
                     JETSON_JETPACK="3.1" ;;
             "24.2.1") 
@@ -127,12 +132,18 @@ else
 fi
 
 # Read opencv version
-if hash pkg-config --modversion opencv 2>/dev/null; then
+pkg-config --exists opencv
+if [ $? == "0" ] ; then
     JETSON_OPENCV=$(pkg-config --modversion opencv)
 else
     JETSON_OPENCV="NOT INSTALLED"
 fi
 
+export JETSON_BOARD
+export JETSON_CUDA
+export JETSON_JETPACK
+export JETSON_L4T
+
 # TODO Add enviroments variables:
 # - UID -> https://devtalk.nvidia.com/default/topic/996988/jetson-tk1/chip-uid/post/5100481/#5100481
 # - GCID, BOARD, EABI

scripts/makeKernel.sh

@@ -1,12 +1,53 @@
 #!/bin/bash
 # Builds the kernel and modules
-# Assumes that the .config file is available
+# Assumes that the .config file is available in /proc/config.gz
+# Added check to see if make builds correctly; retry once if not
+
 cd /usr/src/kernel/kernel-4.4
 make prepare
 make modules_prepare
 # Make alone will build the dts files too
-# make -j6
-make -j6 Image
-make modules
+# Get the number of CPUs 
+NUM_CPU=$(nproc)
+time make -j$(($NUM_CPU - 1)) Image
+if [ $? -eq 0 ] ; then
+  echo "Image make successful"
+else
+  # Try to make again; Sometimes there are issues with the build
+  # because of lack of resources or concurrency issues
+  echo "Make did not build " >&2
+  echo "Retrying ... "
+  # Single thread this time
+  make Image
+  if [ $? -eq 0 ] ; then
+    echo "Image make successful"
+  else
+    # Try to make again
+    echo "Make did not successfully build" >&2
+    echo "Please fix issues and retry build"
+    exit 1
+  fi
+fi
+
+time make -j$(($NUM_CPU - 1)) modules
+if [ $? -eq 0 ] ; then
+  echo "Modules make successful"
+else
+  # Try to make again; Sometimes there are issues with the build
+  # because of lack of resources or concurrency issues
+  echo "Make did not build " >&2
+  echo "Retrying ... "
+  # Single thread this time
+  make modules
+  if [ $? -eq 0 ] ; then
+    echo "Module make successful"
+  else
+    # Try to make again
+    echo "Make did not successfully build" >&2
+    echo "Please fix issues and retry build"
+    exit 1
+  fi
+fi
+
 make modules_install
 

scripts/removeAllKernelSources.sh

@@ -3,5 +3,5 @@
 cd /usr/src
 rm -r kernel
 rm -r hardware
-rm tx2_sources.tbz2
+rm public_sources.tbz2