From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 25 May 2013 14:38:54 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=c3ab47cd913eb07f1d8f55abf0d93969f02eca37;hp=a960637e599524bf3acdd1f043ae5738a85171df

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

diff --git a/config/rootfiles/core/69/filelists/files b/config/rootfiles/core/69/filelists/files
index 4745dbcbe..2bed42ee1 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 000000000..335e0d2f6
--- /dev/null
+++ b/lfs/ax88179
@@ -0,0 +1,82 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2012  IPFire Team <info@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 3d4fe86eb..3126afa28 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