New function to update changelog from git.

[people/teissler/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 1d4cbb04d27509efb06d643356665fa63a988f9e..0b1d7e4033dfbb906174b09b8db938f5ad880b5b 100755 (executable)
--- 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)
 
@@ -335,7 +336,6 @@ buildipfire() {
   ipfiremake linux                     SMP=1
 #  ipfiremake linux-fusion             SMP=1
 #  ipfiremake ipp2p                    SMP=1
-#  ipfiremake zaptel                   SMP=1
 #  ipfiremake r8169                    SMP=1
 #  ipfiremake r8168                    SMP=1
 #  ipfiremake atl1                     SMP=1
@@ -344,11 +344,9 @@ buildipfire() {
   ipfiremake v4l-dvb                   SMP=1
   ipfiremake madwifi                    SMP=1
   ipfiremake sane              KMOD=1  SMP=1
-  ipfiremake openswan          KMOD=1  SMP=1
   ipfiremake linux
 #  ipfiremake linux-fusion
 #  ipfiremake ipp2p
-#  ipfiremake zaptel
 #  ipfiremake r8169
 #  ipfiremake r8168
 #  ipfiremake atl1
@@ -357,7 +355,6 @@ buildipfire() {
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake sane              KMOD=1
-  ipfiremake openswan          KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -421,7 +418,7 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake ipp2p                     IPT=1
+#  ipfiremake ipp2p                    IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -587,6 +584,8 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
+  ipfiremake syslinux
+  ipfiremake tftp-hpa
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -601,7 +600,6 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  ipfiremake syslinux
   ipfiremake as86
   ipfiremake mbr
   ipfiremake memtest
@@ -658,6 +656,9 @@ buildpackages() {
   rm -f $BASEDIR/doc/packages-list
   # packages-list.txt is ready to be displayed for wiki page
   beautify message DONE
+  
+  # Update changelog
+  $0 git log
 
   # Create images for install
        ipfiremake cdrom ED=full
@@ -923,6 +924,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)