Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index ee258cc37c6bde85160ea3b9bf6a0d7e752002b9..68ad82afd721b9eea16af87732e3e6ebece44e14 100644 (file)
--- 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 d9e617a6d0c430aec037eaeb671d9b50eccaaf8b..80050ccfc73d733e20a088366fd63223e3f7dab9 100644 (file)
--- 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 4741754167d636ab47ec05ec321e9825f20a47e2..84a8a2b158b165f392c9cd2a045363bf601cc40c 100644 (file)
--- 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 (file)
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),