Upgraded Squidclamav

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

diff --git a/make.sh b/make.sh
index 7f62482ece9cd6dca143fe5436e6b8354d556988..31a1e13c0cea5254fc61405c04d4c4877dfe8628 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-test"
+VERSION="2.3-beta4"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -343,8 +343,13 @@ 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 atl2
   ipfiremake r8168
   ipfiremake r8169
@@ -900,6 +905,8 @@ othersrc)
 git)
        case "$2" in
          update|up)
+                       ## REMOVES ALL UNCOMMITTED CHANGES!
+                       [ "$3" == "--force" ] && git checkout -f
                        git pull
                ;;
          commit|ci)