[Balloon-svn] r1215 - balloon/trunk

Top Page
Attachments:
Message as email
+ (text/plain)
Delete this message
Reply to this message
Author: subversion@balloonboard.org
Date:  
To: balloon-svn
Subject: [Balloon-svn] r1215 - balloon/trunk
Author: wookey
Date: 2010-08-25 11:27:53 +0100 (Wed, 25 Aug 2010)
New Revision: 1215

Modified:
balloon/trunk/Makefile.tools
Log:
check for git instead of cvs for kernel builds (YAFFS repo changed)
fix all the bashisms so it works where dash is /bin/sh


Modified: balloon/trunk/Makefile.tools
===================================================================
--- balloon/trunk/Makefile.tools    2010-08-24 16:49:35 UTC (rev 1214)
+++ balloon/trunk/Makefile.tools    2010-08-25 10:27:53 UTC (rev 1215)
@@ -10,7 +10,7 @@
 emdebian-bits: build-essential fakeroot sudo multistrap
 bootldr-tools: build-essential arm-linux-gnu-gcc linux-libc-dev-arm-cross libc6-dev-arm-cross #zlib-arm-cross
 buildroot-tools: build-essential texinfo ncurses
-kernel-tools: build-essential depmod cvs
+kernel-tools: build-essential depmod git


#this lot allows installing without bothering you about emdebian archive key
DEBAPTOPTIONS=--quiet --assume-yes
@@ -19,23 +19,27 @@

 cvs quilt diff gcc bzip2 fakeroot bison flex wget:
     #testing if $@ is installed - install it if the build stops here
-    $@ --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install $@; fi 
+    $@ --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install $@; fi 


 sudo: 
     #testing if sudo is installed - install it if the build stops here
-    sudo -V &> /dev/null 
+    sudo -V 1> /dev/null 2>&1 


 subversion: 
     #testing if subversion is installed - install it if the build stops here
-    svn --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install subversion; fi 
+    svn --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install subversion; fi 


 depmod:
     #testing if module-init-tools is installed - install it if the build stops here
-    /sbin/depmod --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install module-init-tools; fi 
+    /sbin/depmod --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install module-init-tools; fi 


+git: 
+    #testing if git is installed - install it if the build stops here
+    git --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install git-core; fi 
+
 texinfo: 
     #testing if texinfo is installed - install it if the build stops here
-    makeinfo --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install texinfo; fi 
+    makeinfo --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install texinfo; fi 


 ncurses:
     #testing if ncurses-dev is installed - install it if the build stops here
@@ -43,43 +47,43 @@


 multistrap:
     #testing if $@ is installed - install it if the build stops here
-    /usr/sbin/multistrap --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install multistrap; fi
+    /usr/sbin/multistrap --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install multistrap; fi
     dpkg --compare-versions `dpkg-query -W -f '$${Version}' multistrap` '>=' "2.1.5~tcl+1" || exit 2


 debhelper:
     #testing if $@ is installed - install it if the build stops here
-    test -x /usr/bin/dh_testversion &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install debhelper; fi
+    test -x /usr/bin/dh_testversion 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(DEBAPTOPTIONS) install debhelper; fi

    
 arm-linux-gnu-gcc:
     #testing if $@ toolchain is installed - install it if the build stops here
-    $@ --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS)  install gcc-4.1-arm-linux-gnu; fi 
+    $@ --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS)  install gcc-4.1-arm-linux-gnu; fi 


 arm-linux-gnueabi-gcc:
     #testing if $@ toolchain is installed - install it if the build stops here
-    $@ --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install gcc-4.1-arm-linux-gnueabi; fi 
+    $@ --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install gcc-4.1-arm-linux-gnueabi; fi 


 arm-linux-gnu-g++:
     #testing if $@ toolchain is installed - install it if the build stops here
-    $@ --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS)  install g++-4.1-arm-linux-gnu; fi 
+    $@ --version 1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS)  install g++-4.1-arm-linux-gnu; fi 


 arm-linux-gnueabi-g++:
     #testing if $@ toolchain is installed - install it if the build stops here
-    $@ --version &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS)  install g++-4.1-arm-linux-gnueabi; fi 
+    $@ --version  1> /dev/null 2>&1 || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS)  install g++-4.1-arm-linux-gnueabi; fi 


 #these three packages are old-arm for bootldr currently - should be 'arm|armel' but bootldr needs fixing
 zlib-arm-cross:
     #testing if zlib1g-dev is cross-installed - install it with apt-cross if the build stops here
     test -e /usr/arm-linux-gnu/include/zlib.h || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install $@ || sudo apt-cross -a arm $(APTCROSSOPTIONS) -i zlib1g-dev \
-      || echo "Make sure you have install apt-cross and added emdebian.org to your sources.list. See http://www.emdebian.org/tools/crosstools.html"; fi
+      || echo "Make sure you have installed apt-cross and added emdebian.org to your sources.list. See http://www.emdebian.org/tools/crosstools.html"; fi


 libc6-dev-arm-cross:
     #testing if $@ is installed - install it with apt-cross if the build stops here
     test -e /usr/arm-linux-gnu/include/string.h || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install $@ || sudo apt-cross -a arm $(APTCROSSOPTIONS) -i libc6-dev \
-      || echo "Make sure you have install apt-cross and added emdebian.org to your sources.list. See http://www.emdebian.org/tools/crosstools.html"; fi
+      || echo "Make sure you have installed apt-cross and added emdebian.org to your sources.list. See http://www.emdebian.org/tools/crosstools.html"; fi


 linux-libc-dev-arm-cross:
     #testing if $@ is installed - install it if the build stops here
-    dpkg -s $@ &> /dev/null || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install $@ || sudo apt-cross -a arm $(APTCROSSOPTIONS) -i linux-libc-dev \
+    test -e /usr/arm-linux-gnu/include/linux/errno.h || if [ -e /etc/debian_version ]; then sudo apt-get $(EMDEBAPTOPTIONS) install $@ || sudo apt-cross -a arm $(APTCROSSOPTIONS) -i linux-libc-dev \
       || echo "Make sure you have added emdebian.org to your sources.list. See http://www.emdebian.org/tools/crosstools.html"; fi