X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=2439df84cad9eaf61b910f127d1b169a4193dccf;hp=63785025efdf6d61b1db61dc73138830ce9b2116;hb=fc6ae4c68d867c1fc202473ff6e8a1e473615876;hpb=e49f7f0d67f795eb7e2ddf922a47f01b206f403e

diff --git a/make.sh b/make.sh
index 63785025ef..2439df84ca 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,34 +335,19 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-  ipfiremake linux			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 r8169
-#  ipfiremake r8168
-#  ipfiremake atl1
   ipfiremake atl2
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
-  ipfiremake sane		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
@@ -418,7 +405,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-#  ipfiremake ipp2p			IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -456,6 +442,11 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser
+  ipfiremake python-setuptools
+  ipfiremake python-clientform
+  ipfiremake python-mechanize
+  ipfiremake python-feedparser
+  ipfiremake python-rssdler
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -468,7 +459,6 @@ buildipfire() {
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
-  ipfiremake squid-graph
   ipfiremake squidguard
   ipfiremake calamaris
   ipfiremake tcpdump
@@ -503,7 +493,6 @@ buildipfire() {
   ipfiremake spamassassin
   ipfiremake amavisd
   ipfiremake alsa
-  ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
   ipfiremake libid3tag
@@ -551,8 +540,6 @@ buildipfire() {
   ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
-  ipfiremake neon
-  ipfiremake subversion
   ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
@@ -566,7 +553,6 @@ buildipfire() {
   ipfiremake tunctl
   ipfiremake nagios
   ipfiremake ebtables
-  ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
   ipfiremake directfb
@@ -586,6 +572,15 @@ buildipfire() {
   ipfiremake urlgrabber
   ipfiremake syslinux
   ipfiremake tftp-hpa
+  ipfiremake cpufrequtils
+  ipfiremake dbus
+  ipfiremake bluetooth
+  ipfiremake gutenprint
+  ipfiremake apcupsd
+  ipfiremake iperf
+  ipfiremake netcat
+  ipfiremake 7zip
+  ipfiremake lynis
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -750,6 +745,11 @@ build)
 
 	beautify build_stage "Building packages"
 	buildpackages
+	
+	beautify build_stage "Checking Logfiles for new Files"
+	cd ..
+	tools/checknewlog.pl
+
 	beautify build_end
 	;;
 shell)
@@ -859,7 +859,7 @@ gettoolchain)
 		cd $BASEDIR/cache/toolchains
 		wget $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
 		if [ $? -ne 0 ]; then
-			echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
+			echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
 		else
 			if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
 				echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
@@ -890,6 +890,8 @@ othersrc)
 git)
 	case "$2" in
 	  update|up)
+	  		## REMOVES ALL UNCOMMITTED CHANGES!
+	  		[ "$3" == "--force" ] && git checkout -f
 			git pull
 	  	;;
 	  commit|ci)
@@ -923,7 +925,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