X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=4ecf3df42cf6c64d5f4c7cebc31e99c049eef4c8;hp=a4337a41d9e31747ece624d759f56c48b5a0e000;hb=44e8a23a32634a4ae07cd321d60c5de31e5183ef;hpb=46ea679e1ea0dd728cacfa209ee6a85b4b6a2cdc

diff --git a/make.sh b/make.sh
index a4337a41d9..4ecf3df42c 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-beta3"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -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,30 @@ 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 linux
-#  ipfiremake linux-fusion
-#  ipfiremake ipp2p
-#  ipfiremake r8169
-#  ipfiremake r8168
-#  ipfiremake atl1
+  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
   ipfiremake cpio
@@ -417,7 +420,7 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-#  ipfiremake ipp2p			IPT=1
+  ipfiremake ipp2p			IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -502,7 +505,6 @@ buildipfire() {
   ipfiremake spamassassin
   ipfiremake amavisd
   ipfiremake alsa
-  ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
   ipfiremake libid3tag
@@ -583,7 +585,12 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
+  ipfiremake syslinux
   ipfiremake tftp-hpa
+  ipfiremake cpufrequtils
+  ipfiremake dbus
+  ipfiremake bluetooth
+  ipfiremake gutenprint
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -598,7 +605,6 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  ipfiremake syslinux
   ipfiremake as86
   ipfiremake mbr
   ipfiremake memtest
@@ -655,6 +661,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
@@ -854,7 +864,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
@@ -920,6 +930,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)