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

diff --git a/make.sh b/make.sh
index 13002c6a1d..a4337a41d9 100755
--- a/make.sh
+++ b/make.sh
@@ -22,13 +22,14 @@
 ############################################################################
 #
 
-NAME="IPFire"				# Software name
-SNAME="ipfire"				# Short name
-VERSION="2.1"				# Version number
-SLOGAN="www.ipfire.org"			# Software slogan
-CONFIG_ROOT=/var/ipfire			# Configuration rootdir
-NICE=10					# Nice level
-MAX_RETRIES=1				# prefetch/check loop
+NAME="IPFire"										# Software name
+SNAME="ipfire"									# Short name
+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
+MAX_RETRIES=1										# prefetch/check loop
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 
@@ -332,26 +333,27 @@ buildipfire() {
   ipfiremake rp-pppoe
   ipfiremake unzip
   ipfiremake linux			SMP=1
-  ipfiremake ipp2p			SMP=1
-  ipfiremake zaptel			SMP=1
-  ipfiremake r8169			SMP=1
-  ipfiremake r8168			SMP=1
-  ipfiremake mcs7830			SMP=1
-  ipfiremake atl1			SMP=1
-  ipfiremake dm9601			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 ipp2p
-  ipfiremake zaptel
-  ipfiremake r8169
-  ipfiremake r8168
-  ipfiremake mcs7830
-  ipfiremake atl1
-  ipfiremake dm9601
+#  ipfiremake linux-fusion
+#  ipfiremake ipp2p
+#  ipfiremake r8169
+#  ipfiremake r8168
+#  ipfiremake atl1
+  ipfiremake atl2
   ipfiremake kqemu
-  ipfiremake sane		KMOD=1
+  ipfiremake v4l-dvb
   ipfiremake madwifi
+  ipfiremake sane		KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -415,9 +417,8 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake ipp2p			IPT=1
+#  ipfiremake ipp2p			IPT=1
   ipfiremake linux-igd
-  ipfiremake ipac-ng
   ipfiremake ipaddr
   ipfiremake iptstate
   ipfiremake iputils
@@ -460,7 +461,6 @@ buildipfire() {
   ipfiremake noip_updater
   ipfiremake ntp
   ipfiremake openssh
-  ipfiremake openswan
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
@@ -509,6 +509,7 @@ buildipfire() {
   ipfiremake libmad
   ipfiremake libogg
   ipfiremake libvorbis
+  ipfiremake libdvbpsi
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
@@ -534,7 +535,6 @@ buildipfire() {
   ipfiremake portmap
   ipfiremake nfs
   ipfiremake nmap
-  ipfiremake mbmon
   ipfiremake ncftp
   ipfiremake etherwake
   ipfiremake bwm-ng
@@ -542,10 +542,12 @@ buildipfire() {
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake which
+  ipfiremake openswan
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
   ipfiremake pcmciautils
+  ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
   ipfiremake neon
@@ -554,6 +556,7 @@ buildipfire() {
   ipfiremake teamspeak
   ipfiremake elinks
   ipfiremake igmpproxy
+  ipfiremake fbset
   ipfiremake sdl
   ipfiremake qemu
   ipfiremake sane
@@ -565,6 +568,8 @@ buildipfire() {
   ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
+  ipfiremake directfb
+  ipfiremake dfb++
   ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake vdr
@@ -572,8 +577,21 @@ buildipfire() {
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake bc
+  ipfiremake esniper
+  ipfiremake vnstat
+  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() {
@@ -645,7 +663,10 @@ buildpackages() {
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
   	ipfiremake usb-stick
   fi
-  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
+
+  # Create updater package
+  ipfiremake updater
+  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
 
@@ -897,7 +918,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} master
+	  	git push ${GIT_URL} ${GIT_BRANCH}
 	  	;;
 	esac
 	;;