X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=f1e40623fdc74194d4290ee179fb24413d7cc47b;hp=09a9d0041b2cd476a3d067bfcf85f43cbac7ee66;hb=050080d67b5bf439ec6e39be0d4fa8f5ea311b36;hpb=4f1b7a27db6b0282eb2bb70fb9e20608d155c4e8

diff --git a/make.sh b/make.sh
index 09a9d0041b..f1e40623fd 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.3-test"
+VERSION="2.3"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -177,7 +177,9 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j6"
+    if [ -z $MAKETUNING ]; then
+       MAKETUNING="-j6"
+    fi
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -304,7 +306,7 @@ buildbase() {
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
-    lfsmake2 modutils
+    lfsmake2 module-init-tools
     lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
@@ -333,33 +335,19 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-#  ipfiremake linux			SMP=1
-#  ipfiremake linux-fusion		SMP=1
-#  ipfiremake ipp2p			SMP=1
-#  ipfiremake atl2			SMP=1
-#  ipfiremake kqemu			SMP=1
-#  ipfiremake v4l-dvb			SMP=1
-#  ipfiremake madwifi                    SMP=1
-#  ipfiremake alsa		KMOD=1	SMP=1
-#  ipfiremake sane		KMOD=1	SMP=1
-#  ipfiremake openswan		KMOD=1	SMP=1
   ipfiremake linux
-  ipfiremake linux-fusion
   ipfiremake atl2
-  ipfiremake r8168
-  ipfiremake r8169
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
-  ipfiremake alsa		KMOD=1
-  ipfiremake sane		KMOD=1
-  ipfiremake openswan		KMOD=1
+  ipfiremake alsa			KMOD=1
+  ipfiremake openswan			KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake klibc
   ipfiremake mkinitcpio
-  ipfiremake udev				KLIBC=1
+  ipfiremake udev			KLIBC=1
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -589,6 +577,12 @@ buildipfire() {
   ipfiremake bluetooth
   ipfiremake gutenprint
   ipfiremake apcupsd
+  ipfiremake iperf
+  ipfiremake netcat
+  ipfiremake 7zip
+  ipfiremake lynis
+  ipfiremake cryptsetup
+  ipfiremake splix
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -898,6 +892,8 @@ othersrc)
 git)
 	case "$2" in
 	  update|up)
+	  		## REMOVES ALL UNCOMMITTED CHANGES!
+	  		[ "$3" == "--force" ] && git checkout -f
 			git pull
 	  	;;
 	  commit|ci)
@@ -931,7 +927,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} ${GIT_BRANCH}
+		git push ${GIT_URL} ${GIT_BRANCH} $3
 	  	;;
 	  log)
 		[ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG