X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=1dce1ecb0b960ca3a367d3a24f9a02920cbd77ee;hb=982f9d55f6076ba24e3255f5db5c84aad82cda6b;hp=a6aa6427b9ae46768d4f0a7e16f52ccbf3141373;hpb=2c1b94f009d834408dce67d1cc97a840b2e94f2e;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index a6aa6427b..1dce1ecb0 100755
--- a/make.sh
+++ b/make.sh
@@ -333,24 +333,26 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-  ipfiremake linux			SMP=1
-  ipfiremake linux-fusion		SMP=1
+#  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
-  ipfiremake madwifi                    SMP=1
-  ipfiremake alsa		KMOD=1	SMP=1
-  ipfiremake sane		KMOD=1	SMP=1
-  ipfiremake openswan		KMOD=1	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 linux25
+  ipfiremake atl2			KVER=2.6.25.17
+  ipfiremake kqemu			KVER=2.6.25.17
+  ipfiremake v4l-dvb			KVER=2.6.25.17
+  ipfiremake madwifi			KVER=2.6.25.17
+  ipfiremake alsa		KMOD=1	KVER=2.6.25.17
   ipfiremake linux
-  ipfiremake linux-fusion
-#  ipfiremake ipp2p
-  ipfiremake r8169
-  ipfiremake r8168
   ipfiremake atl2
+  ipfiremake r8168
+  ipfiremake r8169
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
@@ -420,7 +422,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-#  ipfiremake ipp2p			IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -458,6 +459,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
@@ -470,7 +476,6 @@ buildipfire() {
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
-  ipfiremake squid-graph
   ipfiremake squidguard
   ipfiremake calamaris
   ipfiremake tcpdump
@@ -505,7 +510,6 @@ buildipfire() {
   ipfiremake spamassassin
   ipfiremake amavisd
   ipfiremake alsa
-  ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
   ipfiremake libid3tag
@@ -553,8 +557,6 @@ buildipfire() {
   ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
-  ipfiremake neon
-  ipfiremake subversion
   ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
@@ -568,7 +570,6 @@ buildipfire() {
   ipfiremake tunctl
   ipfiremake nagios
   ipfiremake ebtables
-  ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
   ipfiremake directfb
@@ -590,7 +591,11 @@ buildipfire() {
   ipfiremake tftp-hpa
   ipfiremake cpufrequtils
   ipfiremake dbus
-  ipfiremake bluez
+  ipfiremake bluetooth
+  ipfiremake gutenprint
+  ipfiremake apcupsd
+  ipfiremake iperf
+  ipfiremake netcat
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -755,6 +760,11 @@ build)
 
 	beautify build_stage "Building packages"
 	buildpackages
+	
+	beautify build_stage "Checking Logfiles for new Files"
+	cd ..
+	tools/checknewlog.pl
+
 	beautify build_end
 	;;
 shell)
@@ -895,6 +905,8 @@ othersrc)
 git)
 	case "$2" in
 	  update|up)
+	  		## REMOVES ALL UNCOMMITTED CHANGES!
+	  		[ "$3" == "--force" ] && git checkout -f
 			git pull
 	  	;;
 	  commit|ci)