From 7ab20fc516fc6beea625b5227236c7b69295b15e Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 23 Jul 2013 08:43:36 -0500 Subject: [PATCH] scripts: sync with master Signed-off-by: Robert Nelson --- patch.sh | 4 +++- system.sh.sample | 5 ++++- tools/host_det.sh | 53 +++++++++++++++++++++++++++-------------------- version.sh | 9 ++++++-- 4 files changed, 45 insertions(+), 26 deletions(-) diff --git a/patch.sh b/patch.sh index 1d776a426..c14c1e896 100644 --- a/patch.sh +++ b/patch.sh @@ -44,7 +44,9 @@ start_cleanup () { } cleanup () { - git format-patch -${number} -o ${DIR}/patches/ + if [ "${number}" ] ; then + git format-patch -${number} -o ${DIR}/patches/ + fi exit } diff --git a/system.sh.sample b/system.sh.sample index b226ed382..8a9ae4adb 100644 --- a/system.sh.sample +++ b/system.sh.sample @@ -39,8 +39,11 @@ fi ##For Freescale: i.mx53: #ZRELADDR=0x70008000 # -##For Freescale: i.mx6: +##For Freescale: i.mx6q/dl/solo: #ZRELADDR=0x10008000 +# +##For Freescale: i.mx6sl: +#ZRELADDR=0x80008000 ###OPTIONAL: MMC: (REQUIRED FOR RUNNING: tools/install_kernel.sh) #Note: This operates on raw disks, NOT PARTITIONS.. diff --git a/tools/host_det.sh b/tools/host_det.sh index c5bc16589..ba9ff41ef 100755 --- a/tools/host_det.sh +++ b/tools/host_det.sh @@ -87,19 +87,19 @@ Missing mkimage command. debian_regs () { unset deb_pkgs pkg="bc" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " pkg="build-essential" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " pkg="device-tree-compiler" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " pkg="fakeroot" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " pkg="lsb-release" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " pkg="lzma" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " pkg="lzop" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " unset warn_dpkg_ia32 unset stop_pkg_search @@ -167,26 +167,32 @@ debian_regs () { case "${deb_distro}" in squeeze|lucid) pkg="uboot-mkimage" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " ;; - wheezy|jessie|sid|precise|quantal|raring|saucy) + *) pkg="u-boot-tools" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " ;; esac + #lsb_release -cs ; dpkg --list | grep libncurses5-dev + #squeeze : [ii libncurses5-dev 5.7+20100313-5 developer's libraries and docs for ncurses] + #wheezy : [ii libncurses5-dev 5.9-10 armhf developer's libraries for ncurses] + #jessie : [ii libncurses5-dev:armhf 5.9+20130608-1 armhf developer's libraries for ncurses] + #sid : [ii libncurses5-dev:armhf 5.9+20130608-1 armhf developer's libraries for ncurses] + #lucid : [ii libncurses5-dev 5.7+20090803-2ubuntu3 developer's libraries and docs for ncurses] + #oneiric : [ii libncurses5-dev 5.9-1ubuntu5.1 developer's libraries for ncurses] + #precise : [ii libncurses5-dev 5.9-4 developer's libraries for ncurses] + #quantal : [ii libncurses5-dev 5.9-10ubuntu1 armhf developer's libraries for ncurses] + #raring : [ii libncurses5-dev 5.9-10ubuntu4 armhf developer's libraries for ncurses] + #saucy : [ii libncurses5-dev 5.9-10ubuntu4 armhf developer's libraries for ncurses] + #pkg: libncurses5-dev + echo "host debug: dpkg --list libncurses5-dev: [`LC_ALL=C dpkg --list | awk '{print $2}' | grep "^libncurses5-dev"`]" case "${deb_distro}" in - squeeze|lucid|precise) - #ii libncurses5-dev 5.9-4 developer's libraries for ncurses - pkg="libncurses5-dev" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " - ;; *) - #ii libncurses5-dev:amd64 5.9+20130504-1 amd64 developer's libraries for ncurses - deb_arch=$(LC_ALL=C dpkg --print-architecture) pkg="libncurses5-dev" - dpkg -l | awk '{print $2}' | grep "^${pkg}:${deb_arch}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " ;; esac @@ -197,12 +203,12 @@ debian_regs () { case "${deb_distro}" in squeeze|lucid|precise) pkg="ia32-libs" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " ;; - wheezy|jessie|sid|quantal|raring|saucy) + *) pkg="ia32-libs" - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " - dpkg -l | awk '{print $2}' | grep "^${pkg}" >/dev/null || dpkg_multiarch=1 + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || deb_pkgs="${deb_pkgs}${pkg} " + LC_ALL=C dpkg --list | awk '{print $2}' | grep "^${pkg}" >/dev/null || dpkg_multiarch=1 ;; esac @@ -228,6 +234,7 @@ debian_regs () { echo "-----------------------------" echo "Please cut, paste and email to: bugs@rcn-ee.com" echo "-----------------------------" + echo "git: `git rev-parse HEAD`" echo "uname -m" uname -m echo "lsb_release -a" @@ -252,8 +259,10 @@ debian_regs () { BUILD_HOST=${BUILD_HOST:="$( detect_host )"} if [ $(which lsb_release) ] ; then info "Detected build host [`lsb_release -sd`]" + info "[debug: `git rev-parse HEAD`]" else info "Detected build host [$BUILD_HOST]" + info "[debug: `git rev-parse HEAD`]" fi case "$BUILD_HOST" in redhat*) diff --git a/version.sh b/version.sh index 980befb9a..9f4872764 100644 --- a/version.sh +++ b/version.sh @@ -2,8 +2,13 @@ # ARCH=$(uname -m) -#Dual/Quad Core arms are now more prevalent, so don't just limit to x86: -CORES=$(cat /proc/cpuinfo | grep processor | wc -l) +#Dual/Quad Core arms are now more prevalent, so just don't limit it x86: +check_cpuinfo=$(cat /proc/cpuinfo | grep "^processor" | awk '{print $1}' | head -n 1) +if [ "x${check_cpuinfo}" = "xprocessor" ] ; then + CORES=$(cat /proc/cpuinfo | grep "^processor" | wc -l) +else + CORES=1 +fi unset GIT_OPTS unset GIT_NOEDIT