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

diff --git a/make.sh b/make.sh
index ae02a2df4f..a4337a41d9 100755
--- 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-test"
+GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
 NICE=10													# Nice level
@@ -333,23 +333,23 @@ 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 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
@@ -417,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
@@ -461,7 +461,6 @@ buildipfire() {
   ipfiremake noip_updater
   ipfiremake ntp
   ipfiremake openssh
-  ipfiremake openswan
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
@@ -543,6 +542,7 @@ buildipfire() {
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake which
+  ipfiremake openswan
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
@@ -582,6 +582,16 @@ buildipfire() {
   ipfiremake vnstati
   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
+  git log -1 >> $BASEDIR/build/var/ipfire/firebuild
+  echo >> $BASEDIR/build/var/ipfire/firebuild
+  git status >> $BASEDIR/build/var/ipfire/firebuild
+  echo >> $BASEDIR/build/var/ipfire/firebuild
+  cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
 }
 
 buildinstaller() {
@@ -681,7 +691,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