Fix ip-up doesnt touch red/active

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

diff --git a/make.sh b/make.sh
index a253100a897175943be9d73976b9a71ca4686de9..3302773e5eaf714c301d83275d6e6b490db1c68a 100755 (executable)
--- 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-beta2"
 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)
 
@@ -333,27 +334,27 @@ buildipfire() {
   ipfiremake rp-pppoe
   ipfiremake unzip
   ipfiremake linux                     SMP=1
-#  ipfiremake linux-fusion             SMP=1
+  ipfiremake linux-fusion              SMP=1
 #  ipfiremake ipp2p                    SMP=1
-#  ipfiremake r8169                    SMP=1
-#  ipfiremake r8168                    SMP=1
-#  ipfiremake atl1                     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 sane              KMOD=1  SMP=1
+  ipfiremake openswan          KMOD=1  SMP=1
   ipfiremake linux
-#  ipfiremake linux-fusion
+  ipfiremake linux-fusion
 #  ipfiremake ipp2p
-#  ipfiremake r8169
-#  ipfiremake r8168
-#  ipfiremake atl1
+  ipfiremake r8169
+  ipfiremake r8168
   ipfiremake atl2
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake sane              KMOD=1
+  ipfiremake openswan          KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -655,6 +656,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
@@ -920,6 +925,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)