scripts: sync with master of: https://github.com/RobertCNelson/stable…

…-kernel.git Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
RobertCNelson · Aug 19, 2014 · d10dece · d10dece
1 parent c7f2a27
commit d10dece
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/build_deb.sh b/build_deb.sh
@@ -185,7 +185,7 @@ unset LINUX_GIT
 . ${DIR}/system.sh
 /bin/sh -e "${DIR}/scripts/gcc.sh" || { exit 1 ; }
 . ${DIR}/.CC
-echo "debug: CC=${CC}"
+echo "CROSS_COMPILE=${CC}"
 
 . ${DIR}/version.sh
 export LINUX_GIT

diff --git a/build_kernel.sh b/build_kernel.sh
@@ -274,7 +274,7 @@ unset LINUX_GIT
 . ${DIR}/system.sh
 /bin/sh -e "${DIR}/scripts/gcc.sh" || { exit 1 ; }
 . ${DIR}/.CC
-echo "debug: CC=${CC}"
+echo "CROSS_COMPILE=${CC}"
 
 . ${DIR}/version.sh
 export LINUX_GIT

diff --git a/scripts/git.sh b/scripts/git.sh
@@ -38,9 +38,6 @@ git_kernel_torvalds () {
 check_and_or_clone () {
 	#For Legacy: moving to "${DIR}/ignore/linux-src/" for all new installs
 	if [ ! "${LINUX_GIT}" ] && [ -f "${HOME}/linux-src/.git/config" ] ; then
-		echo "-----------------------------"
-		echo "scripts/git: Warning: LINUX_GIT not defined in system.sh"
-		echo "using legacy location: ${HOME}/linux-src"
 		LINUX_GIT="${HOME}/linux-src"
 	fi
 
@@ -88,14 +85,11 @@ git_kernel () {
 
 	cd ${LINUX_GIT}/
 	echo "-----------------------------"
-	echo "scripts/git: Debug: LINUX_GIT is setup as..."
-	pwd
-	echo "-----------------------------"
-	cat .git/config
-	echo "-----------------------------"
-	echo "scripts/git: Updating LINUX_GIT tree via: git fetch"
+	echo "scripts/git: Debug: LINUX_GIT is setup as: [${LINUX_GIT}]."
+	echo "scripts/git: [`cat .git/config | grep url | sed 's/\t//g' | sed 's/ //g'`]"
 	git fetch || true
-	cd -
+	echo "-----------------------------"
+	cd ${DIR}/
 
 	if [ ! -f "${DIR}/KERNEL/.git/config" ] ; then
 		rm -rf ${DIR}/KERNEL/ || true

diff --git a/tools/rebuild.sh b/tools/rebuild.sh
@@ -192,7 +192,7 @@ unset LINUX_GIT
 . ${DIR}/system.sh
 /bin/sh -e "${DIR}/scripts/gcc.sh" || { exit 1 ; }
 . ${DIR}/.CC
-echo "debug: CC=${CC}"
+echo "CROSS_COMPILE=${CC}"
 
 . ${DIR}/version.sh
 export LINUX_GIT

diff --git a/tools/rebuild_deb.sh b/tools/rebuild_deb.sh
@@ -164,7 +164,7 @@ unset LINUX_GIT
 . ${DIR}/system.sh
 /bin/sh -e "${DIR}/scripts/gcc.sh" || { exit 1 ; }
 . ${DIR}/.CC
-echo "debug: CC=${CC}"
+echo "CROSS_COMPILE=${CC}"
 
 . ${DIR}/version.sh
 export LINUX_GIT