Started core33.

diff --git a/config/rootfiles/core/33/exclude b/config/rootfiles/core/33/exclude
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/config/rootfiles/core/33/filelists/files b/config/rootfiles/core/33/filelists/files
new file mode 100644 (file)
index 0000000..0037af1
--- /dev/null
+++ b/config/rootfiles/core/33/filelists/files
@@ -0,0 +1 @@
+etc/system-release

diff --git a/config/rootfiles/core/33/meta b/config/rootfiles/core/33/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/33/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/33/update.sh b/config/rootfiles/core/33/update.sh
new file mode 100644 (file)
index 0000000..08c886d
--- /dev/null
+++ b/config/rootfiles/core/33/update.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2009 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+#
+#Stop services
+
+#
+extract_files
+#
+#Start services
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+#Rebuild module dep's
+#depmod -a
+#Don't report the exitcode of depmod
+exit 0

diff --git a/make.sh b/make.sh
index f999f63cff12d70d919fc2fb6df163453f714462..89ef361e61eede7bbcd057e3c6b1bceecb065de5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -22,18 +22,20 @@
 ############################################################################
 #
 
-NAME="IPFire"                                                                          # Software name
-SNAME="ipfire"                                                                 # Short name
-VERSION="2.5"
-CORE="32"
-GIT_BRANCH=master:master                                                                               # Version number
-SLOGAN="www.ipfire.org"                                        # Software slogan
-CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
-NICE=10                                                                                                        # Nice level
-MAX_RETRIES=1                                                                          # prefetch/check loop
+NAME="IPFire"                                                  # Software name
+SNAME="ipfire"                                                 # Short name
+VERSION="2.5"                                                  # Version number
+CORE="33"                                                      # Core Level (Filename)
+PAKFIRE_CORE="32"                                              # 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
+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)
+GIT_TAG=$(git tag | tail -1)                                   # Git Tag
+GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
 TOOLCHAINVER=1
 IPFVER="full"                          # Which versions should be compiled? (full|devel)
 
@@ -638,8 +640,12 @@ buildipfire() {
   git status >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
-  echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  echo $NAME $VERSION - Core$CORE > $BASEDIR/build/etc/system-release
+  echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
+  if [ "$GIT_BRANCH" = "master" ]; then
+       echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
+  else
+       echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+  fi
 }
 
 buildinstaller() {
@@ -985,7 +991,7 @@ git)
                [ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first."
                        GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x"
                        
-               git push ${GIT_URL} ${GIT_BRANCH} $3
+               git push ${GIT_URL} $3
                ;;
          log)
                [ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG