Added a --force flag to guarantee a successful pull.

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 43b08d0865fc50125441001da6ca58ac764162e5..d6e235a7bed8f0eb37676cec11042f20dfa289e9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -177,7 +177,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j6"
+    MAKETUNING="-j8"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -343,10 +343,16 @@ buildipfire() {
 #  ipfiremake alsa             KMOD=1  SMP=1
 #  ipfiremake sane             KMOD=1  SMP=1
 #  ipfiremake openswan         KMOD=1  SMP=1
+  ipfiremake linux25
+  ipfiremake atl2                      KVER=2.6.25.17
+  ipfiremake kqemu                     KVER=2.6.25.17
+  ipfiremake v4l-dvb                   KVER=2.6.25.17
+  ipfiremake madwifi                   KVER=2.6.25.17
+  ipfiremake alsa              KMOD=1  KVER=2.6.25.17
   ipfiremake linux
-#  ipfiremake linux-fusion
-  ipfiremake ipp2p
   ipfiremake atl2
+  ipfiremake r8168
+  ipfiremake r8169
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
@@ -416,7 +422,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-#  ipfiremake ipp2p                    IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -454,6 +459,11 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser
+  ipfiremake python-setuptools
+  ipfiremake python-clientform
+  ipfiremake python-mechanize
+  ipfiremake python-feedparser
+  ipfiremake python-rssdler
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -584,6 +594,8 @@ buildipfire() {
   ipfiremake bluetooth
   ipfiremake gutenprint
   ipfiremake apcupsd
+  ipfiremake iperf
+  ipfiremake netcat
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -750,8 +762,9 @@ build)
        buildpackages
        
        beautify build_stage "Checking Logfiles for new Files"
+       cd ..
        tools/checknewlog.pl
-       
+
        beautify build_end
        ;;
 shell)
@@ -892,6 +905,8 @@ othersrc)
 git)
        case "$2" in
          update|up)
+                       ## REMOVES ALL UNCOMMITTED CHANGES!
+                       [ "$3" == "--force" ] && git checkout -f
                        git pull
                ;;
          commit|ci)