Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x

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

diff --git a/make.sh b/make.sh
index dadf2ff6e5f3a51d21748409be569a62f22a617a..1fb884afd7fea3b88c957f191f8db839939b069b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3"
+VERSION="2.5beta2"
 CORE="28"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
@@ -337,6 +337,16 @@ buildipfire() {
   ipfiremake rp-pppoe
   ipfiremake pptp
   ipfiremake unzip
+  ipfiremake which
+  ipfiremake linux                     XEN=1
+  ipfiremake atl2                      XEN=1
+  ipfiremake kqemu                     XEN=1
+  ipfiremake v4l-dvb                   XEN=1
+  ipfiremake madwifi                   XEN=1
+#  ipfiremake alsa                     XEN=1 KMOD=1
+  ipfiremake openswan                  XEN=1 KMOD=1
+  ipfiremake mISDN                     XEN=1
+  ipfiremake compat-wireless           XEN=1
   ipfiremake linux
   ipfiremake atl2
   ipfiremake kqemu
@@ -345,7 +355,7 @@ buildipfire() {
   ipfiremake alsa                      KMOD=1
   ipfiremake openswan                  KMOD=1
   ipfiremake mISDN
-  ipfiremake linux                     XEN=1
+  ipfiremake compat-wireless
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -360,6 +370,7 @@ buildipfire() {
   ipfiremake curl
   ipfiremake python
   ipfiremake libnet
+  ipfiremake libnl
   ipfiremake libidn
   ipfiremake libjpeg
   ipfiremake libpng
@@ -530,7 +541,6 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
-  ipfiremake which
   ipfiremake openswan
   ipfiremake lsof
   ipfiremake centerim
@@ -570,6 +580,7 @@ buildipfire() {
   ipfiremake esniper
   ipfiremake vnstat
   ipfiremake vnstati
+  ipfiremake iw
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
@@ -601,6 +612,7 @@ buildipfire() {
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
+  ipfiremake cacti
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -685,8 +697,6 @@ buildpackages() {
        ipfiremake usb-stick ED=$IPFVER
   fi
 
-  # Create updater package
-  #ipfiremake updater
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages