From cf16098bec56f07d0fadaa9475b9718366c330d2 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 29 Apr 2013 12:41:39 -0500
Subject: [PATCH] scripts: sync with master
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/gcc.sh | 37 ++++++++++++++++++++-----------------
scripts/git.sh | 20 ++++++++++++++------
2 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/scripts/gcc.sh b/scripts/gcc.sh
index 86cd09a51..e3db94147 100755
--- a/scripts/gcc.sh
+++ b/scripts/gcc.sh
@@ -86,7 +86,7 @@ dl_gcc_generic () {
if [ -d ${DIR}/dl/${directory} ] ; then
rm -rf ${DIR}/dl/${directory} || true
fi
- tar xjf ${DIR}/dl/${filename} -C ${DIR}/dl/
+ ${untar} ${DIR}/dl/${filename} -C ${DIR}/dl/
if [ -f ${DIR}/dl/${directory}/${binary}gcc ] ; then
touch ${DIR}/dl/${directory}/${datestamp}
fi
@@ -112,33 +112,36 @@ armv7_toolchain () {
# filename="gcc-linaro-arm-linux-gnueabi-2012.04-20120426_linux.tar.bz2"
# directory="gcc-linaro-arm-linux-gnueabi-2012.04-20120426_linux"
# datestamp="20120426-gcc-linaro-arm-linux-gnueabi"
+# untar="tar -xjf"
# binary="bin/arm-linux-gnueabi-"
#Used for Cortex-A
#https://launchpad.net/linaro-toolchain-binaries/trunk/2013.03/+download/gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2
- toolchain_name="gcc-linaro-arm-linux-gnueabihf"
- site="https://launchpad.net/linaro-toolchain-binaries"
- version="trunk/2013.03"
- filename="gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2"
- directory="gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux"
- datestamp="20130313-gcc-linaro-arm-linux-gnueabihf"
-
- binary="bin/arm-linux-gnueabihf-"
-
- #Used for Cortex-A: gcc-4.8 testing, as "every" branch is broken...
- #https://launchpad.net/linaro-toolchain-binaries/trunk/2013.04/+download/gcc-linaro-arm-linux-gnueabihf-4.8-2013.04-20130417_linux.tar.bz2
-
# toolchain_name="gcc-linaro-arm-linux-gnueabihf"
# site="https://launchpad.net/linaro-toolchain-binaries"
-# version="trunk/2013.04"
-# directory="${toolchain_name}-4.8-2013.04-20130417_linux"
-# filename="${directory}.tar.bz2"
-# datestamp="20130313-${toolchain_name}"
+# version="trunk/2013.03"
+# filename="gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux.tar.bz2"
+# directory="gcc-linaro-arm-linux-gnueabihf-4.7-2013.03-20130313_linux"
+# datestamp="20130313-gcc-linaro-arm-linux-gnueabihf"
+# untar="tar -xjf"
# binary="bin/arm-linux-gnueabihf-"
+ #Used for Cortex-A
+ #https://launchpad.net/linaro-toolchain-binaries/trunk/2013.04/+download/gcc-linaro-arm-linux-gnueabihf-4.8-2013.04-20130417_linux.tar.xz
+
+ toolchain_name="gcc-linaro-arm-linux-gnueabihf"
+ site="https://launchpad.net/linaro-toolchain-binaries"
+ version="trunk/2013.04"
+ directory="${toolchain_name}-4.8-2013.04-20130417_linux"
+ filename="${directory}.tar.xz"
+ datestamp="20130313-${toolchain_name}"
+ untar="tar -xJf"
+
+ binary="bin/arm-linux-gnueabihf-"
+
dl_gcc_generic
}
diff --git a/scripts/git.sh b/scripts/git.sh
index 32f6dc5af..4919a2251 100755
--- a/scripts/git.sh
+++ b/scripts/git.sh
@@ -36,18 +36,26 @@ git_kernel_torvalds () {
}
check_and_or_clone () {
- if [ ! "${LINUX_GIT}" ] ; then
- if [ -f "${HOME}/linux-src/.git/config" ] ; then
+ #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
+
+ if [ ! "${LINUX_GIT}" ]; then
+ if [ -f "${DIR}/ignore/linux-src/.git/config" ] ; then
echo "-----------------------------"
echo "scripts/git: Warning: LINUX_GIT not defined in system.sh"
- echo "using default location: ${HOME}/linux-src"
+ echo "using default location: ${DIR}/ignore/linux-src/"
else
echo "-----------------------------"
echo "scripts/git: Warning: LINUX_GIT not defined in system.sh"
- echo "cloning ${torvalds_linux} to default location: ${HOME}/linux-src"
- git clone ${torvalds_linux} ${HOME}/linux-src
+ echo "cloning ${torvalds_linux} to default location: ${DIR}/ignore/linux-src"
+ git clone ${torvalds_linux} ${DIR}/ignore/linux-src
fi
- LINUX_GIT="${HOME}/linux-src"
+ LINUX_GIT="${DIR}/ignore/linux-src"
fi
}
--
GitLab