Skip to content

Commit

Permalink
scripts: sync with master
Browse files Browse the repository at this point in the history 
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information
@RobertCNelson
RobertCNelson committed Jul 23, 2013
1 parent afcee68 commit 7ab20fc
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 26 deletions.
4 changes: 3 additions & 1 deletion patch.sh
View file
Expand Up @@ -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
}

Expand Down
5 changes: 4 additions & 1 deletion system.sh.sample
View file
Expand Up @@ -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..
Expand Down
53 changes: 31 additions & 22 deletions tools/host_det.sh
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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"
Expand All @@ -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*)
Expand Down
9 changes: 7 additions & 2 deletions version.sh
View file
Expand Up @@ -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
Expand Down

0 comments on commit 7ab20fc

Please sign in to comment.