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 01f547269da80deb75c121e6c1ec28230311d7b6 (commit) via b30b170975ccbf6515a9495a2da8dc29dbc27dde (commit) via 94ca39b479b1c122294bce9c30d3fbac58ac1738 (commit) from 033ba0349c946f9ca705029a5368ae5db2db461e (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 01f547269da80deb75c121e6c1ec28230311d7b6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 17 18:35:55 2012 +0100
kernel: update to 3.2.34.
commit b30b170975ccbf6515a9495a2da8dc29dbc27dde Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 17 18:35:14 2012 +0100
dvb-firmware: add dvb-ttpci-01.fw to image.
commit 94ca39b479b1c122294bce9c30d3fbac58ac1738 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 17 15:39:54 2012 +0100
sysctl: activate conntrack accounting.
-----------------------------------------------------------------------
Summary of changes: config/etc/sysctl.conf | 2 ++ config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- config/rootfiles/common/dvb-firmwares | 1 + config/rootfiles/core/65/update.sh | 2 +- lfs/dvb-firmwares | 2 ++ lfs/linux | 6 +++--- 7 files changed, 11 insertions(+), 6 deletions(-)
Difference in files: diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index b293457..8e06701 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -20,6 +20,8 @@ net.ipv4.conf.all.accept_redirects = 0 net.ipv4.conf.all.accept_source_route = 0 net.ipv4.conf.all.log_martians = 1
+net.netfilter.nf_conntrack_acct = 1 + kernel.printk = 1 4 1 7 vm.swappiness=0 vm.mmap_min_addr = 4096 diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 4482c9b..d2ad827 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.33 Kernel Configuration +# Linux/i386 3.2.34 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 2298c53..9dd0d39 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.33 Kernel Configuration +# Linux/i386 3.2.34 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/config/rootfiles/common/dvb-firmwares b/config/rootfiles/common/dvb-firmwares index a6ba837..3a521b1 100644 --- a/config/rootfiles/common/dvb-firmwares +++ b/config/rootfiles/common/dvb-firmwares @@ -2,6 +2,7 @@ lib/firmware/dvb-fe-bcm3510-01.fw lib/firmware/dvb-fe-or51132-qam.fw lib/firmware/dvb-fe-or51132-vsb.fw lib/firmware/dvb-fe-or51211.fw +lib/firmware/dvb-ttpci-01.fw #lib/firmware/dvb-ttpci-01.fw-261a #lib/firmware/dvb-ttpci-01.fw-261b #lib/firmware/dvb-ttpci-01.fw-261c diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh index b9ff01c..4854994 100644 --- a/config/rootfiles/core/65/update.sh +++ b/config/rootfiles/core/65/update.sh @@ -57,7 +57,7 @@ fi
# # -KVER="3.2.33" +KVER="3.2.34" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/dvb-firmwares b/lfs/dvb-firmwares index 724c46b..cd029e2 100644 --- a/lfs/dvb-firmwares +++ b/lfs/dvb-firmwares @@ -72,4 +72,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -p /lib/firmware tar axf $(DIR_DL)/$(DL_FILE) \ -C /lib/firmware/ + # use newest ttpci firmware + cp /lib/firmware/dvb-ttpci-01.fw-2622 /lib/firmware/dvb-ttpci-01.fw @$(POSTBUILD) diff --git a/lfs/linux b/lfs/linux index dbe0896..1c5448c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,7 +24,7 @@
include Config
-VER = 3.2.33 +VER = 3.2.34
RPI_PATCHES = linux-3.2.27-9245b4c
@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS =
-PAK_VER = 22 +PAK_VER = 23 DEPS = ""
VERSUFIX=ipfire$(KCFG) @@ -71,7 +71,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 486521c7b00a92fc99e122b84ae9f089 +$(DL_FILE)_MD5 = a16ecee73774d4f73388870fb593d811 rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = c20baa8dc2527ce89a302862c3fc7f58
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree