scripts: merge script changes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

build_mainline.sh

@@ -190,6 +190,7 @@ fi
 #unset FULL_REBUILD
 FULL_REBUILD=1
 if [ "${FULL_REBUILD}" ] ; then
+	export TOPOFTREE=1
 	/bin/bash -e "${DIR}/scripts/git.sh" || { exit 1 ; }
 
 	if [ "${RUN_BISECT}" ] ; then
@@ -217,4 +218,4 @@ if [ "${IMX_BOOTLETS}" ] ; then
 		exit
 	fi
 	make_bootlets
-fi
+fi
\ No newline at end of file

scripts/git.sh

@@ -132,6 +132,11 @@ git_kernel () {
 		git checkout ${KERNEL_SHA} -b v${KERNEL_TAG}-${BUILD}
 	fi
 
+	if [ "${TOPOFTREE}" ] ; then
+		git pull ${GIT_OPTS} ${torvalds_linux} master || true
+		git pull ${GIT_OPTS} ${torvalds_linux} master --tags || true
+	fi
+
 	git describe
 
 	cd ${DIR}/