diff --git a/scripts/gcc.sh b/scripts/gcc.sh index 6dbd655a5f11d21e86fa28cad5ae18b41d1eb848..ee51f3206f5883b1181f41e8b371b6d26fbae704 100755 --- a/scripts/gcc.sh +++ b/scripts/gcc.sh @@ -29,34 +29,38 @@ ubuntu_arm_gcc_installed () { unset armel_pkg unset armhf_pkg if [ $(which lsb_release) ] ; then - distro_release=$(lsb_release -cs) + deb_distro=$(lsb_release -cs) #Linux Mint: Compatibility Matrix - case "${distro_release}" in + #http://www.linuxmint.com/oldreleases.php + case "${deb_distro}" in maya) - distro_release="precise" + deb_distro="precise" ;; nadia) - distro_release="quantal" + deb_distro="quantal" + ;; + olivia) + deb_distro="raring" ;; esac - case "${distro_release}" in - oneiric|precise|quantal|raring) + case "${deb_distro}" in + precise|quantal|raring) #http://packages.ubuntu.com/raring/gcc-arm-linux-gnueabi armel_pkg="gcc-arm-linux-gnueabi" ;; esac - case "${distro_release}" in - oneiric|precise|quantal|raring) + 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} ${distro_release} has these ARM gcc cross compilers available in their repo:" + 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 diff --git a/tools/host_det.sh b/tools/host_det.sh index af081c286c65ee69156ec84c0d67221c65c47cd5..c4f38587344ede1103011fd2973ab6480dd85dd9 100755 --- a/tools/host_det.sh +++ b/tools/host_det.sh @@ -94,13 +94,10 @@ debian_regs () { dpkg -l | grep lzop >/dev/null || deb_pkgs="${deb_pkgs}lzop " dpkg -l | grep fakeroot >/dev/null || deb_pkgs="${deb_pkgs}fakeroot " - #Lucid -> Oneiric - if [ ! -f "/usr/lib/libncurses.so" ] ; then - #Precise -> - if [ ! -f "/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null`/libncurses.so" ] ; then - deb_pkgs="${deb_pkgs}libncurses5-dev " - fi - fi + #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 @@ -109,24 +106,19 @@ debian_regs () { deb_distro=$(lsb_release -cs) #Linux Mint: Compatibility Matrix + #http://www.linuxmint.com/oldreleases.php case "${deb_distro}" in + debian) + deb_distro="jessie" + ;; maya) deb_distro="precise" ;; nadia) deb_distro="quantal" ;; - debian) - #http://www.linuxmint.com/download_lmde.php - #lsb_release -a - #No LSB modules are available. - #Distributor ID: LinuxMint - #Description: Linux Mint Debian Edition - #Release: 1 - #Codename: debian - # - #why? 'debian' for Codename? - deb_distro="jessie" + olivia) + deb_distro="raring" ;; esac @@ -136,10 +128,12 @@ debian_regs () { squeeze|lucid) dpkg -l | grep uboot-mkimage >/dev/null || deb_pkgs="${deb_pkgs}uboot-mkimage" ;; - wheezy|jessie|natty|oneiric|precise|quantal|raring|saucy) + wheezy|jessie|precise|quantal|raring|saucy) dpkg -l | grep u-boot-tools >/dev/null || deb_pkgs="${deb_pkgs}u-boot-tools" ;; - maverick) + natty|oneiric) + #Remove when no longer listed here: + #http://us.archive.ubuntu.com/ubuntu/dists/ warn_eol_distro=1 ;; *)