X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=75515cd7d8a055645cfd998fba95f62b7ee5fe35;hb=2f0c3fa77834bc0ba649160bab1214557f09e559;hp=9f121d1d8acbc6ca58cdfe9dfc15f1a4be4fec10;hpb=52948e87b185cc7f8ad47fb7c8680a4d66a51bef;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index 9f121d1d8a..75515cd7d8 100755
--- a/make.sh
+++ b/make.sh
@@ -336,8 +336,6 @@ buildipfire() {
 #  ipfiremake linux			SMP=1
 #  ipfiremake linux-fusion		SMP=1
 #  ipfiremake ipp2p			SMP=1
-#  ipfiremake r8169			SMP=1
-#  ipfiremake r8168			SMP=1
 #  ipfiremake atl2			SMP=1
 #  ipfiremake kqemu			SMP=1
 #  ipfiremake v4l-dvb			SMP=1
@@ -346,16 +344,11 @@ buildipfire() {
 #  ipfiremake sane		KMOD=1	SMP=1
 #  ipfiremake openswan		KMOD=1	SMP=1
   ipfiremake linux
-  ipfiremake linux-fusion
-  ipfiremake ipp2p
-  ipfiremake r8169
-  ipfiremake r8168
   ipfiremake atl2
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa		KMOD=1
-  ipfiremake sane		KMOD=1
   ipfiremake openswan		KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -420,7 +413,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake ipp2p			IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -458,6 +450,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
@@ -564,7 +561,6 @@ buildipfire() {
   ipfiremake tunctl
   ipfiremake nagios
   ipfiremake ebtables
-  ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
   ipfiremake directfb
@@ -589,6 +585,9 @@ buildipfire() {
   ipfiremake bluetooth
   ipfiremake gutenprint
   ipfiremake apcupsd
+  ipfiremake iperf
+  ipfiremake netcat
+  ipfiremake 7zip
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -753,6 +752,11 @@ build)
 
 	beautify build_stage "Building packages"
 	buildpackages
+	
+	beautify build_stage "Checking Logfiles for new Files"
+	cd ..
+	tools/checknewlog.pl
+
 	beautify build_end
 	;;
 shell)
@@ -893,6 +897,8 @@ othersrc)
 git)
 	case "$2" in
 	  update|up)
+	  		## REMOVES ALL UNCOMMITTED CHANGES!
+	  		[ "$3" == "--force" ] && git checkout -f
 			git pull
 	  	;;
 	  commit|ci)
@@ -926,7 +932,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