From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d0196acc90145f8e8831a89bc32e4f86a02c7eb6
Date: Sun, 16 Jun 2013 20:12:47 +0200 [thread overview]
Message-ID: <20130616181247.C19C1206C2@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 9483 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 d0196acc90145f8e8831a89bc32e4f86a02c7eb6 (commit)
via 22358c067272bf5cb1b951fa19fe3b2d0c9edf45 (commit)
from 9515a14ef4f7f7ade9b3c9d5b6324abfbb57e252 (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 d0196acc90145f8e8831a89bc32e4f86a02c7eb6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jun 16 20:12:26 2013 +0200
motion: rootfile update.
commit 22358c067272bf5cb1b951fa19fe3b2d0c9edf45
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jun 16 15:13:47 2013 +0200
r81xx: switch realtek lan module from vendor to kernel.
some users has reported problems with the realtek vendor modules.
-problems at link detection with r8101.
-problems with igmpproxy with r8169.
so we switch to the original kernel modul. (vendor drivers are used for
xen because r8169 crash here)
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/70/update.sh | 23 ++++++++++++++++++++++-
config/rootfiles/packages/motion | 35 ++++++++++++++++++-----------------
lfs/r8101 | 6 ++++--
lfs/r8168 | 4 +++-
lfs/r8169 | 8 ++++++--
5 files changed, 53 insertions(+), 23 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/70/update.sh b/config/rootfiles/core/70/update.sh
index 39b1371..9c926d9 100644
--- a/config/rootfiles/core/70/update.sh
+++ b/config/rootfiles/core/70/update.sh
@@ -54,6 +54,28 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi
+#Switch realtek lan from vendor to kernel original...
+ mv /lib/modules/*-ipfire*/kernel/drivers/net/ethernet/realtek/r81??.ko \
+ /lib/modules/*-ipfire*/kernel/drivers/net/ethernet/realtek/r81??.ko.vendor
+ cp /lib/modules/*-ipfire*/kernel/drivers/net/ethernet/realtek/r8169.ko.org \
+ /lib/modules/*-ipfire*/kernel/drivers/net/ethernet/realtek/r8169.ko
+ rm /lib/modules/*-ipfire*/kernel/drivers/net/ethernet/realtek/r8101.ko
+ rm /lib/modules/*-ipfire*/kernel/drivers/net/ethernet/realtek/r8168.ko
+ rm /var/cache/pakfire/linux-pae-*.ipfire
+
+#rebuild module dep's
+arch=`uname -m`
+
+if [ ${arch::3} == "arm" ]; then
+ depmod -a 3.2.46-ipfire-kirkwood >/dev/null 2>&1
+ depmod -a 3.2.46-ipfire-omap >/dev/null 2>&1
+ depmod -a 3.2.46-ipfire-rpi >/dev/null 2>&1
+else
+ depmod -a 3.2.46-ipfire >/dev/null 2>&1
+ depmod -a 3.2.46-ipfire-pae >/dev/null 2>&1
+ depmod -a 2.6.32.60-ipfire-xen >/dev/null 2>&1
+fi
+
#
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
@@ -72,4 +94,3 @@ touch /var/run/need_reboot
sendprofile
#Don't report the exitcode last command
exit 0
-
diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/motion
index 1492b8b..aa3e5b7 100644
--- a/config/rootfiles/packages/motion
+++ b/config/rootfiles/packages/motion
@@ -1,24 +1,25 @@
#etc/motion-dist.conf
etc/motion.conf
usr/bin/motion
-#usr/share/doc/motion-3.2.11
-#usr/share/doc/motion-3.2.11/CHANGELOG
-#usr/share/doc/motion-3.2.11/COPYING
-#usr/share/doc/motion-3.2.11/CREDITS
-#usr/share/doc/motion-3.2.11/INSTALL
-#usr/share/doc/motion-3.2.11/README
-#usr/share/doc/motion-3.2.11/motion_guide.html
+#usr/share/doc/motion-3.2.12
+#usr/share/doc/motion-3.2.12/CHANGELOG
+#usr/share/doc/motion-3.2.12/COPYING
+#usr/share/doc/motion-3.2.12/CREDITS
+#usr/share/doc/motion-3.2.12/INSTALL
+#usr/share/doc/motion-3.2.12/README
+#usr/share/doc/motion-3.2.12/motion_guide.html
#usr/share/man/man1/motion.1
-#usr/share/motion-3.2.11
-#usr/share/motion-3.2.11/examples
-#usr/share/motion-3.2.11/examples/motion-dist.conf
-#usr/share/motion-3.2.11/examples/motion.init-Debian
-#usr/share/motion-3.2.11/examples/motion.init-FreeBSD.sh
-#usr/share/motion-3.2.11/examples/motion.init-RH
-#usr/share/motion-3.2.11/examples/thread1.conf
-#usr/share/motion-3.2.11/examples/thread2.conf
-#usr/share/motion-3.2.11/examples/thread3.conf
-#usr/share/motion-3.2.11/examples/thread4.conf
+#usr/share/motion-3.2.12
+#usr/share/motion-3.2.12/examples
+#usr/share/motion-3.2.12/examples/motion-dist.conf
+#usr/share/motion-3.2.12/examples/motion.init-Debian
+#usr/share/motion-3.2.12/examples/motion.init-Fedora
+#usr/share/motion-3.2.12/examples/motion.init-FreeBSD.sh
+#usr/share/motion-3.2.12/examples/motion.init-RH
+#usr/share/motion-3.2.12/examples/thread1.conf
+#usr/share/motion-3.2.12/examples/thread2.conf
+#usr/share/motion-3.2.12/examples/thread3.conf
+#usr/share/motion-3.2.12/examples/thread4.conf
var/ipfire/backup/addons/includes/motion
etc/rc.d/init.d/motion
etc/rc.d/rc0.d/K01motion
diff --git a/lfs/r8101 b/lfs/r8101
index 85d3900..39a6a28 100644
--- a/lfs/r8101
+++ b/lfs/r8101
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2013 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 #
@@ -28,8 +28,10 @@ VERSUFIX = ipfire$(KCFG)
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.60
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+ MODNAME = r8101.ko
else
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+ MODNAME = r8101.ko.vendor
endif
VER = 1.023.00
@@ -83,6 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8101_add_missing_pciids.patch
cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
- cd $(DIR_APP)/src && install -m 644 r8101.ko $(MODPATH)
+ cd $(DIR_APP)/src && install -m 644 r8101.ko $(MODPATH)/$(MODNAME)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/r8168 b/lfs/r8168
index c4aa6a9..8dd3ec4 100644
--- a/lfs/r8168
+++ b/lfs/r8168
@@ -28,8 +28,10 @@ VERSUFIX = ipfire$(KCFG)
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.60
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+ MODNAME = r8168.ko
else
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+ MODNAME = r8168.ko.vendor
endif
VER = 8.035.00
@@ -82,6 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
- cd $(DIR_APP)/src && install -m 644 r8168.ko $(MODPATH)
+ cd $(DIR_APP)/src && install -m 644 r8168.ko $(MODPATH)/$(MODNAME)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/r8169 b/lfs/r8169
index 65c34e6..5e2f4c7 100644
--- a/lfs/r8169
+++ b/lfs/r8169
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2013 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 #
@@ -28,8 +28,10 @@ VERSUFIX = ipfire$(KCFG)
ifeq "$(KCFG)" "-xen"
KVER = 2.6.32.60
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net
+ MODNAME = r8169.ko
else
MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/realtek
+ MODNAME = r8169.ko.vendor
endif
VER = 6.017.00
@@ -81,11 +83,13 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
#Save original r8169 module
+ifeq "$(KCFG)" "-xen"
-mv $(MODPATH)/r8169.ko \
$(MODPATH)/r8169.ko.org
+endif
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/r8169_add_missing_pciids.patch
cd $(DIR_APP) && make -C /lib/modules/$(KVER)-$(VERSUFIX)/build/ SUBDIRS=$(DIR_APP)/src modules
- cd $(DIR_APP)/src && install -m 644 r8169.ko $(MODPATH)
+ cd $(DIR_APP)/src && install -m 644 r8169.ko $(MODPATH)/$(MODNAME)
@rm -rf $(DIR_APP)
@$(POSTBUILD)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-06-16 18:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130616181247.C19C1206C2@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox