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 df382ce8d488ab186686ffaa30481bbea25530b7..d6e235a7bed8f0eb37676cec11042f20dfa289e9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-beta2"
+VERSION="2.3-test"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -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
 
@@ -333,26 +333,30 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-  ipfiremake linux                     SMP=1
-  ipfiremake linux-fusion              SMP=1
+#  ipfiremake linux                    SMP=1
+#  ipfiremake linux-fusion             SMP=1
 #  ipfiremake ipp2p                    SMP=1
-  ipfiremake r8169                     SMP=1
-  ipfiremake r8168                     SMP=1
-  ipfiremake atl2                      SMP=1
-  ipfiremake kqemu                     SMP=1
-  ipfiremake v4l-dvb                   SMP=1
-  ipfiremake madwifi                    SMP=1
-  ipfiremake sane              KMOD=1  SMP=1
-  ipfiremake openswan          KMOD=1  SMP=1
+#  ipfiremake atl2                     SMP=1
+#  ipfiremake kqemu                    SMP=1
+#  ipfiremake v4l-dvb                  SMP=1
+#  ipfiremake madwifi                    SMP=1
+#  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 r8169
-  ipfiremake r8168
   ipfiremake atl2
+  ipfiremake r8168
+  ipfiremake r8169
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
+  ipfiremake alsa              KMOD=1
   ipfiremake sane              KMOD=1
   ipfiremake openswan          KMOD=1
   ipfiremake pkg-config
@@ -418,7 +422,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-#  ipfiremake ipp2p                    IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -456,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
@@ -468,7 +476,6 @@ buildipfire() {
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
-  ipfiremake squid-graph
   ipfiremake squidguard
   ipfiremake calamaris
   ipfiremake tcpdump
@@ -503,7 +510,6 @@ buildipfire() {
   ipfiremake spamassassin
   ipfiremake amavisd
   ipfiremake alsa
-  ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
   ipfiremake libid3tag
@@ -551,8 +557,6 @@ buildipfire() {
   ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
-  ipfiremake neon
-  ipfiremake subversion
   ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
@@ -566,7 +570,6 @@ buildipfire() {
   ipfiremake tunctl
   ipfiremake nagios
   ipfiremake ebtables
-  ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
   ipfiremake directfb
@@ -586,6 +589,13 @@ buildipfire() {
   ipfiremake urlgrabber
   ipfiremake syslinux
   ipfiremake tftp-hpa
+  ipfiremake cpufrequtils
+  ipfiremake dbus
+  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,6 +760,11 @@ build)
 
        beautify build_stage "Building packages"
        buildpackages
+       
+       beautify build_stage "Checking Logfiles for new Files"
+       cd ..
+       tools/checknewlog.pl
+
        beautify build_end
        ;;
 shell)
@@ -890,6 +905,8 @@ othersrc)
 git)
        case "$2" in
          update|up)
+                       ## REMOVES ALL UNCOMMITTED CHANGES!
+                       [ "$3" == "--force" ] && git checkout -f
                        git pull
                ;;
          commit|ci)