[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 0f18c3088fc531e1b41ea54682a15dee4bf64730

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 0f18c3088fc531e1b41ea54682a15dee4bf64730

[git]

[-- Attachment #1: Type: text/plain, Size: 3871 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, thirteen has been updated
       via  0f18c3088fc531e1b41ea54682a15dee4bf64730 (commit)
       via  2c5aec7d3e1384fec8171d31e7c37b228c608da7 (commit)
      from  98f2c8b8cee4b2123d9a2041f05eced72ead2b5d (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 0f18c3088fc531e1b41ea54682a15dee4bf64730
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 19 18:20:58 2012 +0200

    make.sh: change system_relase generation for user branches.

commit 2c5aec7d3e1384fec8171d31e7c37b228c608da7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 19 09:44:09 2012 +0200

    Revert "kernel: update rpi-patchset to 10182a3."
    
    This reverts commit 1f0b797ef4575b482fd7897922b37d98aa82fb3d.

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

Summary of changes:
 config/kernel/kernel.config.armv5tel-ipfire-rpi |    3 +--
 lfs/linux                                       |    4 ++--
 make.sh                                         |   13 ++++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index a4dfd6d..fb5517f 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.32 Kernel Configuration
+# Linux/arm 3.2.31 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1615,7 +1615,6 @@ CONFIG_I2C_ALGOPCA=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_BCM2708=m
-CONFIG_I2C_BCM2708_BAUDRATE=100000
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_OCORES=m
diff --git a/lfs/linux b/lfs/linux
index ba5d123..e7f48b6 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -26,7 +26,7 @@ include Config
 
 VER           = 3.2.32
 
-RPI_PATCHES = linux-3.2.27-10182a3
+RPI_PATCHES = linux-3.2.27-9245b4c
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.bz2
@@ -76,7 +76,7 @@ $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz	= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 
 $(DL_FILE)_MD5				= d2a4562d8c451e5ec43547e0d8babe57
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= c60d806195e38e39d5cf382b4a0998db
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= c20baa8dc2527ce89a302862c3fc7f58
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 1995836..25958f8 100755
--- a/make.sh
+++ b/make.sh
@@ -760,11 +760,14 @@ 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_BRANCH" = "master" -o "$GIT_BRANCH" = "next" ]; then
-	echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
-  else
-	echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
-  fi
+  case "$GIT_BRANCH" in
+	core*)
+	    echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+	    ;;
+	*)
+	    echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
+	    ;;
+  esac
 }
 
 buildinstaller() {


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