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 4de2df1e0c8dc103c5b845b1b538a6a303c6691c (commit) via ed879161a868e9a9afe5f93ff1625a729eddb510 (commit) via 90d9b6049288301dedb3173f51b470ce141bad2e (commit) via 438a331f3d8879fd508863ef7943271cd1ee3b97 (commit) from 1313b031a8e057b580525d4429ad485571844086 (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 4de2df1e0c8dc103c5b845b1b538a6a303c6691c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 20:11:19 2012 +0100

kernel: updated patch for ipg drivername to kernel 3.2.

commit ed879161a868e9a9afe5f93ff1625a729eddb510 Merge: 438a331 90d9b60 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 19:50:35 2012 +0100

Merge remote-tracking branch 'origin/next' into thirteen

commit 438a331f3d8879fd508863ef7943271cd1ee3b97 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Nov 5 18:42:56 2012 +0100

Revert "installer: Make kernel silent at boot time."

This reverts commit a23305b8a2869414e40d7a49bafd2bbc764ea925.

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

Summary of changes: config/syslinux/syslinux.cfg | 6 +++--- lfs/linux | 2 +- lfs/samba | 6 +++--- src/patches/linux-3.2.33_ipg-fix-driver-name.patch | 15 +++++++++++++++ 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 src/patches/linux-3.2.33_ipg-fix-driver-name.patch

Difference in files: diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg index ee258cc..68ad82a 100644 --- a/config/syslinux/syslinux.cfg +++ b/config/syslinux/syslinux.cfg @@ -2,13 +2,13 @@ TIMEOUT 5000 DISPLAY boot.msg PROMPT 1 DEFAULT vmlinuz - APPEND initrd=instroot vga=791 quiet rhgb ro + APPEND initrd=instroot vga=791 splash=silent ro LABEL novga KERNEL vmlinuz - APPEND initrd=instroot quiet rhgb ro + APPEND initrd=instroot ro LABEL unattended KERNEL vmlinuz - APPEND initrd=instroot vga=791 quiet rhgb unattended ro + APPEND initrd=instroot vga=791 splash=silent unattended ro LABEL memtest KERNEL memtest APPEND - diff --git a/lfs/linux b/lfs/linux index d9e617a..80050cc 100644 --- a/lfs/linux +++ b/lfs/linux @@ -124,7 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33-ledtrig-netdev-1.patch

# Fix uevent PHYSDEVDRIVER -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch

ifeq "$(KCFG)" "-kirkwood" diff --git a/lfs/samba b/lfs/samba index 4741754..84a8a2b 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@

include Config

-VER = 3.5.18 +VER = 3.5.19

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 = 42 +PAK_VER = 43

DEPS = "cups"

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 4bdb6d7ef23369d1c7d0199f0ebe012a +$(DL_FILE)_MD5 = 48718ed4fbc0f0fa7fcc38d52ca3cfff

install : $(TARGET)

diff --git a/src/patches/linux-3.2.33_ipg-fix-driver-name.patch b/src/patches/linux-3.2.33_ipg-fix-driver-name.patch new file mode 100644 index 0000000..95e6107 --- /dev/null +++ b/src/patches/linux-3.2.33_ipg-fix-driver-name.patch @@ -0,0 +1,15 @@ +Patch by Arne Fitzenreiter arne_f@ipfire.org +Fix PHYSDEVDRIVER from "Sundance IPG ..." to the modulname (ipg) + +diff -Naur linux-3.2.33.org/drivers/net/ethernet/icplus/ipg.c linux-3.2.33/drivers/net/ethernet/icplus/ipg.c +--- linux-3.2.33.org/drivers/net/ethernet/icplus/ipg.c 2012-10-31 00:27:11.000000000 +0100 ++++ linux-3.2.33/drivers/net/ethernet/icplus/ipg.c 2012-11-05 20:02:36.529101528 +0100 +@@ -2304,7 +2304,7 @@ + } + + static struct pci_driver ipg_pci_driver = { +- .name = IPG_DRIVER_NAME, ++ .name = DRV_NAME, + .id_table = ipg_pci_tbl, + .probe = ipg_probe, + .remove = __devexit_p(ipg_remove),

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