X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=1ce7c6924b2aff9772da7e5b98cdae90ed8cf911;hp=bc6b22f28f67c7364122dd5d67406b879d94e62d;hb=5ac0da0b63d882afd98cbb1eb2ccbdd1efd35a46;hpb=9dd15f03c4f7fe86a0f496421ba513b5e2e6f89a

diff --git a/make.sh b/make.sh
index bc6b22f28..1ce7c6924 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,8 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.1"										# Version number
+VERSION="2.2-test"
+GIT_BRANCH=rspezial:rspezial										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
 NICE=10													# Nice level
@@ -332,24 +333,24 @@ 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 mcs7830			SMP=1
   ipfiremake atl1			SMP=1
-  ipfiremake dm9601			SMP=1
   ipfiremake kqemu			SMP=1
+  ipfiremake v4l-dvb			SMP=1
   ipfiremake sane		KMOD=1	SMP=1
   ipfiremake linux
+  ipfiremake linux-fusion
   ipfiremake ipp2p
   ipfiremake zaptel
   ipfiremake r8169
   ipfiremake r8168
-  ipfiremake mcs7830
   ipfiremake atl1
-  ipfiremake dm9601
   ipfiremake kqemu
+  ipfiremake v4l-dvb
   ipfiremake sane		KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -517,7 +518,6 @@ buildipfire() {
   ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
-  ipfiremake videolan
   ipfiremake cmake
   ipfiremake libpri
   ipfiremake asterisk
@@ -546,6 +546,7 @@ buildipfire() {
   ipfiremake centerim
   ipfiremake br2684ctl
   ipfiremake pcmciautils
+  ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
   ipfiremake neon
@@ -565,11 +566,16 @@ buildipfire() {
   ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
+  ipfiremake ffmpeg
+  ipfiremake videolan
   ipfiremake vdr
   ipfiremake w_scan
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake bc
+  ipfiremake esniper
+  ipfiremake vnstat
+  ipfiremake vnstati
 }
 
 buildinstaller() {
@@ -643,6 +649,9 @@ buildpackages() {
   fi
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
+  # Create updater package
+  ipfiremake updater
+
   ipfirepackages
 
   # Cleanup
@@ -666,7 +675,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
@@ -893,7 +902,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
 	;;