]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
Add new usb-network modules to kudzu
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index 31a1e13c0cea5254fc61405c04d4c4877dfe8628..75515cd7d8a055645cfd998fba95f62b7ee5fe35 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-beta4"
+VERSION="2.3-test"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -343,21 +343,12 @@ 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 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
   ipfiremake linux-atm
@@ -596,6 +587,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
@@ -940,7 +932,7 @@ git)
                [ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first."
                        GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x"
                        
-               git push ${GIT_URL} ${GIT_BRANCH}
+               git push ${GIT_URL} ${GIT_BRANCH} $3
                ;;
          log)
                [ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG