X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=a4337a41d9e31747ece624d759f56c48b5a0e000;hp=1de1f54c2dedf472bed599face3d6101c8a5658d;hb=f52552554996f991c6a947df5a3531a7f995d6a9;hpb=bde55cfce16a376258dd2c0f41dd054b3c44819c

diff --git a/make.sh b/make.sh
index 1de1f54c2d..a4337a41d9 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.3beta1"
+VERSION="2.3-test"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -333,31 +333,27 @@ buildipfire() {
   ipfiremake rp-pppoe
   ipfiremake unzip
   ipfiremake linux			SMP=1
-  ipfiremake linux-fusion		SMP=1
-  ipfiremake ipp2p			SMP=1
-  ipfiremake zaptel			SMP=1
-  ipfiremake r8169			SMP=1
-  ipfiremake r8168			SMP=1
-  ipfiremake atl1			SMP=1
+#  ipfiremake linux-fusion		SMP=1
+#  ipfiremake ipp2p			SMP=1
+#  ipfiremake r8169			SMP=1
+#  ipfiremake r8168			SMP=1
+#  ipfiremake atl1			SMP=1
   ipfiremake atl2			SMP=1
   ipfiremake kqemu			SMP=1
   ipfiremake v4l-dvb			SMP=1
   ipfiremake madwifi                    SMP=1
   ipfiremake sane		KMOD=1	SMP=1
-  ipfiremake openswan		KMOD=1	SMP=1
   ipfiremake linux
-  ipfiremake linux-fusion
-  ipfiremake ipp2p
-  ipfiremake zaptel
-  ipfiremake r8169
-  ipfiremake r8168
-  ipfiremake atl1
+#  ipfiremake linux-fusion
+#  ipfiremake ipp2p
+#  ipfiremake r8169
+#  ipfiremake r8168
+#  ipfiremake atl1
   ipfiremake atl2
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake sane		KMOD=1
-  ipfiremake openswan		KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -421,7 +417,7 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake ipp2p			IPT=1
+#  ipfiremake ipp2p			IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -465,7 +461,6 @@ buildipfire() {
   ipfiremake noip_updater
   ipfiremake ntp
   ipfiremake openssh
-  ipfiremake openswan
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
@@ -547,6 +542,7 @@ buildipfire() {
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake which
+  ipfiremake openswan
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
@@ -587,6 +583,7 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
+  ipfiremake tftp-hpa
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild