From b83430f99a45b17df20fcaa4ce1e516bbdb53242 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sat, 8 Jun 2013 21:47:26 -0500
Subject: [PATCH] scripts: sync with master
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 5 +++-
scripts/gcc.sh | 68 +----------------------------------------------
scripts/git.sh | 14 ++++++----
tools/host_det.sh | 17 ++++++++----
version.sh | 2 +-
5 files changed, 27 insertions(+), 79 deletions(-)
diff --git a/patch.sh b/patch.sh
index d72be0495..f0f84dfb1 100644
--- a/patch.sh
+++ b/patch.sh
@@ -23,7 +23,6 @@
# Split out, so build_kernel.sh and build_deb.sh can share..
git="git am"
-#git="git am --whitespace=fix"
if [ -f ${DIR}/system.sh ] ; then
. ${DIR}/system.sh
@@ -40,6 +39,10 @@ git_add () {
git commit -a -m 'testing patchset'
}
+start_cleanup () {
+ git="git am --whitespace=fix"
+}
+
cleanup () {
git format-patch -${number} -o ${DIR}/patches/
exit
diff --git a/scripts/gcc.sh b/scripts/gcc.sh
index 506e78742..42bfa856e 100755
--- a/scripts/gcc.sh
+++ b/scripts/gcc.sh
@@ -29,69 +29,6 @@ DIR=$PWD
#linaro_toolchain
. ${DIR}/version.sh
-ubuntu_arm_gcc_installed () {
- unset armel_pkg
- unset armhf_pkg
- if [ $(which lsb_release) ] ; then
- deb_distro=$(lsb_release -cs)
-
- #Linux Mint: Compatibility Matrix
- #http://www.linuxmint.com/oldreleases.php
- case "${deb_distro}" in
- maya)
- deb_distro="precise"
- ;;
- nadia)
- deb_distro="quantal"
- ;;
- olivia)
- deb_distro="raring"
- ;;
- esac
-
- case "${deb_distro}" in
- precise|quantal|raring)
- #http://packages.ubuntu.com/raring/gcc-arm-linux-gnueabi
- armel_pkg="gcc-arm-linux-gnueabi"
- ;;
- esac
-
- case "${deb_distro}" in
- precise|quantal|raring)
- #http://packages.ubuntu.com/raring/gcc-arm-linux-gnueabihf
- armhf_pkg="gcc-arm-linux-gnueabihf"
- ;;
- esac
-
- if [ "${armel_pkg}" ] || [ "${armhf_pkg}" ] ; then
- echo "fyi: ${distro} ${deb_distro} has these ARM gcc cross compilers available in their repo:"
- if [ "${armel_pkg}" ] ; then
- echo "sudo apt-get install ${armel_pkg}"
- fi
- if [ "${armhf_pkg}" ] ; then
- echo "sudo apt-get install ${armhf_pkg}"
- fi
- echo "-----------------------------"
- fi
- fi
-
- if [ "${armel_pkg}" ] || [ "${armhf_pkg}" ] ; then
- if [ $(which arm-linux-gnueabi-gcc) ] ; then
- armel_gcc_test=$(LC_ALL=C arm-linux-gnueabi-gcc -v 2>&1 | grep "Target:" | grep arm || true)
- fi
- if [ $(which arm-linux-gnueabihf-gcc) ] ; then
- armhf_gcc_test=$(LC_ALL=C arm-linux-gnueabihf-gcc -v 2>&1 | grep "Target:" | grep arm || true)
- fi
-
- if [ "x${armel_gcc_test}" != "x" ] ; then
- CC="arm-linux-gnueabi-"
- fi
- if [ "x${armhf_gcc_test}" != "x" ] ; then
- CC="arm-linux-gnueabihf-"
- fi
- fi
-}
-
dl_gcc_generic () {
WGET="wget -c --directory-prefix=${DIR}/dl/"
if [ ! -f ${DIR}/dl/${directory}/${datestamp} ] ; then
@@ -190,10 +127,7 @@ gcc_linaro_toolchain () {
}
if [ "x${CC}" = "x" ] && [ "x${ARCH}" != "xarmv7l" ] ; then
- ubuntu_arm_gcc_installed
- if [ "x${CC}" = "x" ] ; then
- gcc_linaro_toolchain
- fi
+ gcc_linaro_toolchain
fi
GCC_TEST=$(LC_ALL=C ${CC}gcc -v 2>&1 | grep "Target:" | grep arm || true)
diff --git a/scripts/git.sh b/scripts/git.sh
index 096f5ef1e..80a314161 100755
--- a/scripts/git.sh
+++ b/scripts/git.sh
@@ -161,13 +161,17 @@ git_config_user_name=$(git config -l | grep user.name || true)
if [ ! "${git_config_user_email}" ] || [ ! "${git_config_user_name}" ] ; then
echo "-----------------------------"
- echo "This script relies heavily on git, and will fail if user.email/user.name are not defined."
+ echo "Error: git user.name/user.email not set:"
+ echo ""
+ echo "For help please read:"
+ echo "https://help.github.com/articles/setting-your-username-in-git"
+ echo "https://help.github.com/articles/setting-your-email-in-git"
+ echo ""
+ echo "For example, if you name/email was: Billy Everteen/me@here.com"
+ echo "you would type in the terminal window:"
echo "-----------------------------"
- echo "See: https://help.github.com/articles/setting-your-email-in-git"
- echo "git config --global user.email \"me@here.com\""
- echo "-----------------------------"
- echo "See: https://help.github.com/articles/setting-your-username-in-git"
echo "git config --global user.name \"Billy Everyteen\""
+ echo "git config --global user.email \"me@here.com\""
echo "-----------------------------"
exit 1
fi
diff --git a/tools/host_det.sh b/tools/host_det.sh
index c4f385873..dce5f0dd1 100755
--- a/tools/host_det.sh
+++ b/tools/host_det.sh
@@ -94,11 +94,6 @@ debian_regs () {
dpkg -l | grep lzop >/dev/null || deb_pkgs="${deb_pkgs}lzop "
dpkg -l | grep fakeroot >/dev/null || deb_pkgs="${deb_pkgs}fakeroot "
- #Libraires: (make sure we atleast get the native arch one)
- #ii libncurses5-dev:amd64 5.9+20130504-1 amd64 developer's libraries for ncurses
- deb_arch=$(dpkg --print-architecture)
- dpkg -l | grep libncurses5-dev | grep ${deb_arch} >/dev/null || deb_pkgs="${deb_pkgs}libncurses5-dev "
-
unset warn_dpkg_ia32
unset warn_eol_distro
#lsb_release might not be installed...
@@ -141,6 +136,18 @@ debian_regs () {
;;
esac
+ case "${deb_distro}" in
+ precise)
+ #ii libncurses5-dev 5.9-4 developer's libraries for ncurses
+ dpkg -l | grep libncurses5-dev >/dev/null || deb_pkgs="${deb_pkgs}libncurses5-dev "
+ ;;
+ *)
+ #ii libncurses5-dev:amd64 5.9+20130504-1 amd64 developer's libraries for ncurses
+ deb_arch=$(dpkg --print-architecture)
+ dpkg -l | grep libncurses5-dev | grep ${deb_arch} >/dev/null || deb_pkgs="${deb_pkgs}libncurses5-dev "
+ ;;
+ esac
+
cpu_arch=$(uname -m)
if [ "x${cpu_arch}" = "xx86_64" ] ; then
unset dpkg_multiarch
diff --git a/version.sh b/version.sh
index 68982027f..6a0e276a8 100644
--- a/version.sh
+++ b/version.sh
@@ -17,7 +17,7 @@ config="omap2plus_defconfig"
#linaro_toolchain="arm9_gcc_4_7"
#linaro_toolchain="cortex_gcc_4_6"
-linaro_toolchain="cortex_gcc_4_7"
+#linaro_toolchain="cortex_gcc_4_7"
linaro_toolchain="cortex_gcc_4_8"
#Kernel/Build
--
GitLab