From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c3ab47cd913eb07f1d8f55abf0d93969f02eca37
Date: Sat, 25 May 2013 16:39:01 +0200 [thread overview]
Message-ID: <20130525143902.1AE15200DA@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6873 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 c3ab47cd913eb07f1d8f55abf0d93969f02eca37 (commit)
via a081a66df006ace9480ab09d06e37df76bf1c44b (commit)
via bdda6fa3e63d49d772f818dc10af5360d1a969da (commit)
from a960637e599524bf3acdd1f043ae5738a85171df (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 c3ab47cd913eb07f1d8f55abf0d93969f02eca37
Merge: a081a66 a960637
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 25 16:38:54 2013 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit a081a66df006ace9480ab09d06e37df76bf1c44b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 25 16:37:41 2013 +0200
openvpn: Ship verify script again.
Apparently the last core update did not include the new
verify script (although it was in the filelist).
So we ship it again with this update, so that all updated
machines will have the right file. New installations are
good.
commit bdda6fa3e63d49d772f818dc10af5360d1a969da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 25 16:36:48 2013 +0200
Add kernel module for ASIX 88179 USB 3.0 network adapter.
http://forum.ipfire.org/index.php?topic=8220.0
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/69/filelists/files | 1 +
lfs/{cifs-utils => ax88179} | 24 +++++++++++-------------
make.sh | 3 +++
3 files changed, 15 insertions(+), 13 deletions(-)
copy lfs/{cifs-utils => ax88179} (86%)
Difference in files:
diff --git a/config/rootfiles/core/69/filelists/files b/config/rootfiles/core/69/filelists/files
index 4745dbc..2bed42e 100644
--- a/config/rootfiles/core/69/filelists/files
+++ b/config/rootfiles/core/69/filelists/files
@@ -3,3 +3,4 @@ etc/issue
etc/rc.d/init.d/console
var/ipfire/langs/list
var/ipfire/langs/tr.pl
+var/ipfire/ovpn/verify
diff --git a/lfs/ax88179 b/lfs/ax88179
new file mode 100644
index 0000000..335e0d2
--- /dev/null
+++ b/lfs/ax88179
@@ -0,0 +1,82 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-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 #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VERSUFIX = ipfire$(KCFG)
+MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/usb/
+
+VER = 1.4.0
+
+THISAPP = AX88179_178A_LINUX_DRIVER_v$(VER)_SOURCE
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = dfad74d32b82cde468b265fa34c9d85e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make KDIR=/usr/src/linux-$(KVER)
+ cd $(DIR_APP) && install -m 644 ax88179_178a.ko $(MODPATH)
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 3d4fe86..3126afa 100755
--- a/make.sh
+++ b/make.sh
@@ -404,6 +404,7 @@ buildipfire() {
ipfiremake r8101 KCFG="-pae"
ipfiremake e1000e KCFG="-pae"
ipfiremake igb KCFG="-pae"
+ ipfiremake ax88179 KCFG="-pae"
# x86 kernel build
ipfiremake linux KCFG=""
@@ -417,6 +418,7 @@ buildipfire() {
ipfiremake r8101 KCFG=""
ipfiremake e1000e KCFG=""
ipfiremake igb KCFG=""
+ ipfiremake ax88179 KCFG=""
else
# arm-rpi (Raspberry Pi) kernel build
@@ -444,6 +446,7 @@ buildipfire() {
ipfiremake r8101 KCFG="-kirkwood"
ipfiremake e1000e KCFG="-kirkwood"
ipfiremake igb KCFG="-kirkwood"
+ ipfiremake ax88179 KCFG="-kirkwood"
fi
ipfiremake pkg-config
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2013-05-25 14:39 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=20130525143902.1AE15200DA@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