public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 08fc3fda703d50eb50daae77a0821c4870453965
@ 2013-05-26 20:06 git
  0 siblings, 0 replies; only message in thread
From: git @ 2013-05-26 20:06 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 7992 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  08fc3fda703d50eb50daae77a0821c4870453965 (commit)
       via  8f89787bc20fe41aa9873eaea2413950a2afcdad (commit)
      from  a35a0a4e5f3a0e9f1e5c50fb924284ac9163d6f6 (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 08fc3fda703d50eb50daae77a0821c4870453965
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 26 22:04:35 2013 +0200

    compat-drivers: update to 3.8.3-2-snpu.
    
    also add asix gigabit usb drivers.

commit 8f89787bc20fe41aa9873eaea2413950a2afcdad
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 26 22:03:36 2013 +0200

    Revert "Add kernel module for ASIX 88179 USB 3.0 network adapter."
    
    This reverts commit bdda6fa3e63d49d772f818dc10af5360d1a969da.

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

Summary of changes:
 lfs/ax88179        | 82 ------------------------------------------------------
 lfs/compat-drivers | 17 +++++++----
 make.sh            |  3 --
 3 files changed, 12 insertions(+), 90 deletions(-)
 delete mode 100644 lfs/ax88179

Difference in files:
diff --git a/lfs/ax88179 b/lfs/ax88179
deleted file mode 100644
index 335e0d2..0000000
--- a/lfs/ax88179
+++ /dev/null
@@ -1,82 +0,0 @@
-###############################################################################
-#                                                                             #
-# 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/lfs/compat-drivers b/lfs/compat-drivers
index 07dda5b..57ce83c 100644
--- a/lfs/compat-drivers
+++ b/lfs/compat-drivers
@@ -26,14 +26,14 @@ include Config
 
 VERSUFIX=ipfire$(KCFG)
 
-VER        = 3.8-1-u
+VER        = 3.8.3-2-snpu
 
 ifeq "$(KCFG)" "-xen"
 	KVER = 2.6.32.60
 endif
 
 THISAPP    = compat-drivers-$(VER)
-DL_FILE    = compat-drivers-$(VER).tar.xz
+DL_FILE    = compat-drivers-$(VER).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
@@ -42,13 +42,15 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) asix-4.5.0a.tar.xz
+objects = $(DL_FILE) asix-4.5.0a.tar.xz asix_gb-1.4.0a.tar.xz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 asix-4.5.0a.tar.xz = $(DL_FROM)/asix-4.5.0a.tar.xz
+asix_gb-1.4.0a.tar.xz = $(DL_FROM)/asix_gb-1.4.0a.tar.xz
 
-$(DL_FILE)_MD5 = 557e3099c642455ec272d9ddf46de484
+$(DL_FILE)_MD5 = 5a1e27e5b694aa5022116a5a3220bfdc
 asix-4.5.0a.tar.xz_MD5=4219ce7c0cae4fdb580f30ea50cad8e0
+asix_gb-1.4.0a.tar.xz_MD5=9c9db731631abf00da2069d03253f9a7
 
 install : $(TARGET)
 
@@ -97,9 +99,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
 
-	# Build Updated asix usb-lan driver
+	# Build Updated asix usb lan driver
 	cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.5.0a.tar.xz
 
+	# Build Updated asix usb gigabit lan driver
+	cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix_gb-1.4.0a.tar.xz
+	echo 'obj-$$(CONFIG_USB_ASIX_GB) += asix_gb.o' >> $(DIR_APP)/drivers/net/usb/Makefile
+	cd $(DIR_APP) && echo export CONFIG_USB_ASIX_GB=m >> config.mk
+
 	# Add libartas uAP driver
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-libertas_uap.patch
 
diff --git a/make.sh b/make.sh
index 3126afa..3d4fe86 100755
--- a/make.sh
+++ b/make.sh
@@ -404,7 +404,6 @@ buildipfire() {
     ipfiremake r8101			KCFG="-pae"
     ipfiremake e1000e			KCFG="-pae"
     ipfiremake igb			KCFG="-pae"
-    ipfiremake ax88179			KCFG="-pae"
 
     # x86 kernel build
     ipfiremake linux			KCFG=""
@@ -418,7 +417,6 @@ buildipfire() {
     ipfiremake r8101			KCFG=""
     ipfiremake e1000e			KCFG=""
     ipfiremake igb			KCFG=""
-    ipfiremake ax88179			KCFG=""
 
   else
     # arm-rpi (Raspberry Pi) kernel build
@@ -446,7 +444,6 @@ 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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-05-26 20:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-26 20:06 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 08fc3fda703d50eb50daae77a0821c4870453965 git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox