enable klips for kernel25

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

diff --git a/make.sh b/make.sh
index 38fc7c645c08abe02d9176308e7341a1d809f36f..a6ebd3aefa4a81930272c62ec0b00c75ba79c053 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -177,7 +177,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j8"
+    MAKETUNING="-j6"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -343,8 +343,14 @@ 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 openswan          KMOD=1  KVER=2.6.25.17
   ipfiremake linux
-  ipfiremake linux-fusion
   ipfiremake atl2
   ipfiremake r8168
   ipfiremake r8169
@@ -591,6 +597,7 @@ buildipfire() {
   ipfiremake apcupsd
   ipfiremake iperf
   ipfiremake netcat
+  ipfiremake 7zip
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -900,6 +907,8 @@ othersrc)
 git)
        case "$2" in
          update|up)
+                       ## REMOVES ALL UNCOMMITTED CHANGES!
+                       [ "$3" == "--force" ] && git checkout -f
                        git pull
                ;;
          commit|ci)