diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index a4dfd6d1b..fb5517f7a 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 ba5d1235a..e7f48b637 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 38254b0f2..208ddf6d4 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() {