Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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

diff --git a/make.sh b/make.sh
index a7645d2e1cb0f0bbafd863b79744842ade858ac3..1c47706ada6af3ea02176c4b44fe919329bf8d86 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.2-test"
-GIT_BRANCH=rspezial:rspezial                                                                           # Version number
+VERSION="2.3"
+GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level
@@ -341,6 +341,7 @@ buildipfire() {
   ipfiremake atl1                      SMP=1
   ipfiremake kqemu                     SMP=1
   ipfiremake v4l-dvb                   SMP=1
+  ipfiremake madwifi                    SMP=1
   ipfiremake sane              KMOD=1  SMP=1
   ipfiremake linux
   ipfiremake linux-fusion
@@ -351,6 +352,7 @@ buildipfire() {
   ipfiremake atl1
   ipfiremake kqemu
   ipfiremake v4l-dvb
+  ipfiremake madwifi
   ipfiremake sane              KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -508,6 +510,7 @@ buildipfire() {
   ipfiremake libmad
   ipfiremake libogg
   ipfiremake libvorbis
+  ipfiremake libdvbpsi
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
@@ -575,8 +578,12 @@ buildipfire() {
   ipfiremake squidclamav
   ipfiremake bc
   ipfiremake esniper
+  ipfiremake mod_perl
   ipfiremake vnstat
   ipfiremake vnstati
+  ipfiremake wpa_supplicant
+  ipfiremake hostapd
+  ipfiremake urlgrabber
 }
 
 buildinstaller() {
@@ -676,7 +683,7 @@ buildpackages() {
 }
 
 ipfirepackages() {
-       #ipfiremake core-updates
+       ipfiremake core-updates
        for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
                if [ -e $BASEDIR/lfs/$i ]; then
                        ipfiredist $i