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

diff --git a/make.sh b/make.sh
index a253100a8..1dce1ecb0 100755
--- a/make.sh
+++ b/make.sh
@@ -32,6 +32,7 @@ NICE=10													# Nice level
 MAX_RETRIES=1										# prefetch/check loop
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
+GIT_TAG=$(git tag | tail -1)
 
 IPFVER="full"				# Which versions should be compiled? (full|devel)
 
@@ -332,28 +333,32 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-  ipfiremake linux			SMP=1
+#  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 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 atl1
   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 pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -417,7 +422,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-#  ipfiremake ipp2p			IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -455,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
@@ -467,7 +476,6 @@ buildipfire() {
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
-  ipfiremake squid-graph
   ipfiremake squidguard
   ipfiremake calamaris
   ipfiremake tcpdump
@@ -502,7 +510,6 @@ buildipfire() {
   ipfiremake spamassassin
   ipfiremake amavisd
   ipfiremake alsa
-  ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
   ipfiremake libid3tag
@@ -550,8 +557,6 @@ buildipfire() {
   ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
-  ipfiremake neon
-  ipfiremake subversion
   ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
@@ -565,7 +570,6 @@ buildipfire() {
   ipfiremake tunctl
   ipfiremake nagios
   ipfiremake ebtables
-  ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
   ipfiremake directfb
@@ -585,6 +589,13 @@ buildipfire() {
   ipfiremake urlgrabber
   ipfiremake syslinux
   ipfiremake tftp-hpa
+  ipfiremake cpufrequtils
+  ipfiremake dbus
+  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
@@ -655,6 +666,10 @@ buildpackages() {
   rm -f $BASEDIR/doc/packages-list
   # packages-list.txt is ready to be displayed for wiki page
   beautify message DONE
+  
+  # Update changelog
+  cd $BASEDIR
+  $0 git log
 
   # Create images for install
 	ipfiremake cdrom ED=full
@@ -745,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)
@@ -854,7 +874,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
@@ -885,6 +905,8 @@ othersrc)
 git)
 	case "$2" in
 	  update|up)
+	  		## REMOVES ALL UNCOMMITTED CHANGES!
+	  		[ "$3" == "--force" ] && git checkout -f
 			git pull
 	  	;;
 	  commit|ci)
@@ -920,6 +942,12 @@ git)
 			
 	  	git push ${GIT_URL} ${GIT_BRANCH}
 	  	;;
+	  log)
+		[ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG
+		[ -z $LAST_TAG ] || EXT="$LAST_TAG..HEAD"
+
+		git log -n 500 --no-merges --pretty=medium --shortstat $EXT > $BASEDIR/doc/ChangeLog
+	;;
 	esac
 	;;
 uploadsrc)