* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5215ebe18a55fe1d8c498a5814d6730a3aa36c47
@ 2013-03-08 16:33 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-03-08 16:33 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7406 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 5215ebe18a55fe1d8c498a5814d6730a3aa36c47 (commit)
via 42cb38607fcd1b3590ed3d74bfd53d89626cd0fb (commit)
via feb50ba8c2c99fbdb3781075c2590205806002b6 (commit)
via d2f3ea993008c8eee87f89861d83198c49fde41a (commit)
from 465d1730ba9f3d736a700e5c50a8caca2ff1fdae (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 5215ebe18a55fe1d8c498a5814d6730a3aa36c47
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 8 17:32:44 2013 +0100
close core67.
commit 42cb38607fcd1b3590ed3d74bfd53d89626cd0fb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 8 17:31:38 2013 +0100
firewall: fix UPNPFW chain/rules creation order.
commit feb50ba8c2c99fbdb3781075c2590205806002b6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 8 17:30:05 2013 +0100
rpi-firmware: reduce videocore memory to 16MB.
Add some comments about video/hdmi options to config.txt.
commit d2f3ea993008c8eee87f89861d83198c49fde41a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 8 17:12:12 2013 +0100
Revert "rpi-firmware: updated to 98e5704."
This reverts commit 465d1730ba9f3d736a700e5c50a8caca2ff1fdae.
kernel get panic at alsa sound playback with this firmware.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/armv5tel/rpi-firmware | 2 --
config/rootfiles/core/67/exclude | 1 -
.../core/67/filelists/armv5tel/rpi-firmware | 1 -
config/rpi-firmware/config.txt | 30 +++++++++++++++++++---
lfs/rpi-firmware | 6 ++---
make.sh | 2 +-
src/initscripts/init.d/firewall | 3 +--
7 files changed, 32 insertions(+), 13 deletions(-)
delete mode 120000 config/rootfiles/core/67/filelists/armv5tel/rpi-firmware
Difference in files:
diff --git a/config/rootfiles/common/armv5tel/rpi-firmware b/config/rootfiles/common/armv5tel/rpi-firmware
index 0736399..3024548 100644
--- a/config/rootfiles/common/armv5tel/rpi-firmware
+++ b/config/rootfiles/common/armv5tel/rpi-firmware
@@ -5,7 +5,5 @@ boot/config.txt
#boot/first32k.bin
boot/start.elf
boot/start_cd.elf
-boot/start_x.elf
boot/fixup.dat
boot/fixup_cd.dat
-boot/fixup_x.dat
diff --git a/config/rootfiles/core/67/exclude b/config/rootfiles/core/67/exclude
index 321a931..18141fd 100644
--- a/config/rootfiles/core/67/exclude
+++ b/config/rootfiles/core/67/exclude
@@ -1,5 +1,4 @@
srv/web/ipfire/html/proxy.pac
-boot/config.txt
etc/udev/rules.d/30-persistent-network.rules
etc/collectd.custom
etc/shadow
diff --git a/config/rootfiles/core/67/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/67/filelists/armv5tel/rpi-firmware
deleted file mode 120000
index 428fdf8..0000000
--- a/config/rootfiles/core/67/filelists/armv5tel/rpi-firmware
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/rpi-firmware
\ No newline at end of file
diff --git a/config/rpi-firmware/config.txt b/config/rpi-firmware/config.txt
index 47bfc80..266cfb4 100644
--- a/config/rpi-firmware/config.txt
+++ b/config/rpi-firmware/config.txt
@@ -9,8 +9,31 @@
# GPU Memory Settings (16,32,64 ... )
# 16MB has a issue at reboot so we use 32MB memory split
###############################################################################
-gpu_mem_256=32
-gpu_mem_512=32
+gpu_mem=16
+
+###############################################################################
+#
+# hdmi/video options
+#
+###############################################################################
+#
+# Set this if monitor was not detected at reboot.
+#hdmi_force_hotplug=1
+#
+# hdmi_drive: 0 auto, 1 DVI (no Sound), 2 HDMI (Sound)
+#hdmi_drive=1
+#
+# sdtv_mode: 0 NTSC, 1 NTSC (JP), 3 PAL, 4 PAL (Brazil)
+#sdtv_mode=2
+# sdtv_ascpect: 0 4:3, 1 14:9, 2 16:9
+#sdtv_aspect=0
+#
+# overscan
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+#
###############################################################################
#
@@ -24,9 +47,10 @@ gpu_mem_512=32
#sdram_freq_min=250
#
# use following paramters to overclock at load
-#arm_freq=1000
+#arm_freq=900
#core_freq=450
#sdram_freq=450
+# higher clock than 900Mhz most need over voltage. Use with care.
#over_voltage=3
################################################################################
diff --git a/lfs/rpi-firmware b/lfs/rpi-firmware
index a50ced7..c02d5cc 100644
--- a/lfs/rpi-firmware
+++ b/lfs/rpi-firmware
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2012 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 98e5704
+VER = 855e997
THISAPP = rpi-firmware-$(VER)
DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 255bb0e5360d6625e31de3383f1cc528
+$(DL_FILE)_MD5 = c73700a10d792517b2b87fd28a6c9800
install : $(TARGET)
diff --git a/make.sh b/make.sh
index e427929..a8cd21e 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13" # Version number
CORE="67" # Core Level (Filename)
-PAKFIRE_CORE="66" # Core Level (PAKFIRE)
+PAKFIRE_CORE="67" # 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
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index cc6b619..b6dd7d5 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -252,9 +252,8 @@ case "$1" in
# upnp chain for our upnp daemon
/sbin/iptables -t nat -N UPNPFW
/sbin/iptables -t nat -A PREROUTING -j UPNPFW
- /sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW
- # This chain only contains dummy rules.
/sbin/iptables -N UPNPFW
+ /sbin/iptables -A FORWARD -m state --state NEW -j UPNPFW
# Custom mangle chain (for port fowarding)
/sbin/iptables -t mangle -N PORTFWMANGLE
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-08 16:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-08 16:33 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5215ebe18a55fe1d8c498a5814d6730a3aa36c47 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox