[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7b0a7b562dd0689ed001220b41442b61627b118d

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7b0a7b562dd0689ed001220b41442b61627b118d

[git]

[-- Attachment #1: Type: text/plain, Size: 3511 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  7b0a7b562dd0689ed001220b41442b61627b118d (commit)
       via  92e79452599259c0398ad6b16a3ff3cdfd75ca57 (commit)
       via  ab133d83d5f0df9c56d4cf962c6edb5726857419 (commit)
      from  66304ea8bb378c918280df2ddb3349db25aad38f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7b0a7b562dd0689ed001220b41442b61627b118d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Jan 30 19:27:38 2013 +0100

    IPFire 2.13rc1.

commit 92e79452599259c0398ad6b16a3ff3cdfd75ca57
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Jan 30 19:26:40 2013 +0100

    samba: updated to 3.6.12.

commit ab133d83d5f0df9c56d4cf962c6edb5726857419
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Jan 30 19:25:52 2013 +0100

    make.sh: Add "dirty" to system-release if uncommited changes found.

-----------------------------------------------------------------------

Summary of changes:
 lfs/samba |  6 +++---
 make.sh   | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/lfs/samba b/lfs/samba
index 5d0e172..b843dcd 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.6.11
+VER        = 3.6.12
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 45
+PAK_VER    = 46
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9039e0ab3e4fc632ff0a1a8f2433edb4
+$(DL_FILE)_MD5 = 430fd21a1acd26964d3ccf366df8709a
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 8c2bb0d..f48f4ed 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.13beta2"							# Version number
+VERSION="2.13rc1"							# Version number
 CORE="65"							# Core Level (Filename)
 PAKFIRE_CORE="65"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
@@ -763,12 +763,17 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
+  if [ "$(git status -s | wc -l)" == "0" ]; then
+	GIT_STATUS=""
+  else
+	GIT_STATUS="-dirty"
+  fi
   case "$GIT_BRANCH" in
 	core*|beta?|rc?)
-	    echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+	    echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release
 	    ;;
 	*)
-	    echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
+	    echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release
 	    ;;
   esac
 }


hooks/post-receive
--
IPFire 2.x development tree