]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/core66' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Feb 2013 13:29:26 +0000 (14:29 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Feb 2013 13:29:26 +0000 (14:29 +0100)
1  2 
make.sh

diff --combined make.sh
index da3349b2a1d10d00793c30b7ffc0bb29e050491c,05be85725dd272183df6e3f07bedaa1cbb893f84..f6aeaaac23cf092ec657bc87b4ca6143c398f189
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
- VERSION="2.13rc2"                                                     # Version number
- CORE="65"                                                     # Core Level (Filename)
- PAKFIRE_CORE="65"                                             # Core Level (PAKFIRE)
+ VERSION="2.13"                                                        # Version number
+ CORE="66"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="66"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -754,7 -754,6 +754,7 @@@ buildipfire() 
    ipfiremake libstatgrab
    ipfiremake sarg
    ipfiremake fstrim
 +  ipfiremake check_mk_agent
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild