revert to non-lts, update to 0.3.6.17

3 files changed, 47 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35d7efc535d3..a2dab3a54e67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,17 @@
 pkgbase = tn40xx
-	pkgdesc = Tehuti Networks NIC driver for MV88X3120,QT2025,TLK10232 and AQR105 10GbE-Cards
-	pkgver = 0.3.6.13
-	pkgrel = 1
+	pkgdesc = Tehuti Networks NIC driver for MV88X3110, MV88E2010, QT2025, TLK10232 and AQR105 10-GbE-NICs
+	pkgver = 0.3.6.17
+	pkgrel = 2
 	url = http://www.tehutinetworks.net/
 	install = tn40xx.install
 	arch = x86_64
 	license = GPL2
-	makedepends = linux-lts-headers>=4.4
-	makedepends = linux-lts-headers<4.5
-	depends = linux-lts>=4.4
-	depends = linux-lts<4.5
-	options = !libtool
-	options = !strip
-	options = !makeflags
-	options = !buildflags
-	options = staticlibs
-	source = http://www.tehutinetworks.net/images/UL240756/tn40xx-0.3.6.13.tgz
+	makedepends = linux-headers>=2.6.32
+	depends = linux>=2.6.32
+	source = http://www.tehutinetworks.net/images/UL240756/tn40xx-0.3.6.17.tgz
 	source = tn40xx.install
-	sha256sums = eea50b8d312ed5b749c4ad68f01dc64d28e426ee3c87a48094da5498df49af13
-	sha256sums = 51c05ce99b2ccf347ef9150377920d638f85a451bfa4d50d9c9f5dc8b1800e14
+	sha512sums = 21d9eea582edb018b6a1a066cdb7018e89d1b6fba087615792f47fb6412fc2c7d89a489e4de6fcf56a85804d22275867d973c57fdc1b07e37bb526ce67ecbdda
+	sha512sums = 6647c472c0731fd079faf51e75e8b2b21fbc5b0cb98b019e7fda41c65d2cfc143539a69129ca8469e33ab9d3eb30b61e9ca4abdbcc41cd9410d67fafbfa6bc20
 
 pkgname = tn40xx
 
diff --git a/PKGBUILD b/PKGBUILD
index 8cc7b17c3c84..c81e9df9dee8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,52 @@
 # Author: Ido Rosen <ido@kernel.org>
 # Contributor: Florian Knodt <arch@adlerweb.info>
-
-pkgname='tn40xx'
-pkgdesc="Tehuti Networks NIC driver for MV88X3120,QT2025,TLK10232 and AQR105 10GbE-Cards"
-pkgver='0.3.6.13'
-pkgrel=1
-_extramodules=extramodules-4.4-lts
-arch=('x86_64')
-url='http://www.tehutinetworks.net/'
-license=('GPL2')
-depends=('linux-lts>=4.4' 'linux-lts<4.5')
-makedepends=('linux-lts-headers>=4.4' 'linux-lts-headers<4.5')
-options=('!libtool' '!strip' '!makeflags' '!buildflags' 'staticlibs')
+# Maintainer: form
+
+pkgname="tn40xx"
+pkgdesc="Tehuti Networks NIC driver for MV88X3110, MV88E2010, QT2025, TLK10232 and AQR105 10-GbE-NICs"
+pkgver="0.3.6.17"
+pkgrel=2
+arch=("x86_64")
+url="http://www.tehutinetworks.net/"
+license=("GPL2")
+depends=("linux>=2.6.32")
+makedepends=("linux-headers>=2.6.32")
 source=("http://www.tehutinetworks.net/images/UL240756/${pkgname}-${pkgver}.tgz"
-        "tn40xx.install")
+	"tn40xx.install")
 install=tn40xx.install
-sha512sums=('3737d58e2d50c712177385f53330120dc69dbeda3939a0273f354964cb9b5fd8889240bb9f9ad4deb12bc6bfdae5a2bdca594b645c6012088c6b88dc2971ae7b'
-            'b47d366c5bacd8a9308eef013a973ef0ceedea8a27bff23ff3587e435a1798b8a01f08ff0c066d898e443069c17f4035570284a59ac6406f88f3506e5b274d98')
+sha512sums=("21d9eea582edb018b6a1a066cdb7018e89d1b6fba087615792f47fb6412fc2c7d89a489e4de6fcf56a85804d22275867d973c57fdc1b07e37bb526ce67ecbdda"
+	    "6647c472c0731fd079faf51e75e8b2b21fbc5b0cb98b019e7fda41c65d2cfc143539a69129ca8469e33ab9d3eb30b61e9ca4abdbcc41cd9410d67fafbfa6bc20")
 
 build() {
-    cd "${srcdir}/${pkgname}-${pkgver}/"
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    make KVERSION="${_kernver}"
+    cd "${pkgname}-${pkgver}"
+    make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}-${pkgver}/"
+    # get latest installed kernel version. not the running one.
+    _kernver="$(basename `ls -dlt /usr/lib/modules/[2-4]* | head -n 1 | cut -d "/" -f 2-`)"
+    _driverpath="${pkgdir}/usr/lib/modules/${_kernver}/kernel/drivers/net/"
+    _drivername="${_driverpath}${pkgname%}.ko"
+
+    cd "${pkgname}-${pkgver}"
 
-    #Upstream doesn't supply LICENSE file
+    #Upstream does not supply a LICENSE file
     #install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
     #install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}"
 
     install -dm755 "${pkgdir}/usr/share/doc/${pkgname}"
-    install -m644 Readme release_notes \
-            "${pkgdir}/usr/share/doc/${pkgname}"
+    install -m644 Readme release_notes "${pkgdir}/usr/share/doc/${pkgname}"
 
-    install -dm755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d}
-    install -m755 ${pkgname}.ko "${pkgdir}/usr/lib/modules/${_extramodules}/"
+    install -dm755 "${_driverpath}"
+    install -m644 ${pkgname}.ko "${_driverpath}"
+    strip "${_drivername}"
+    xz "${_drivername}"
 
-    gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${pkgname%-*}.ko
-    echo ${pkgname%-*} > "${pkgdir}"/usr/lib/modules-load.d/${pkgname}.conf
+    install -dm755 "${pkgdir}/usr/lib/modules-load.d/"
+    echo ${pkgname} > "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
 
-    install -dm755 "${pkgdir}/etc/pm/config.d/"
-    echo "SUSPEND_MODULES=${pkgname}" > "${pkgdir}/etc/pm/config.d/${pkgname}"
+    if [ -d "/etc/pm/config.d/" ]; then
+        install -dm755 "${pkgdir}/etc/pm/config.d/"
+        echo "SUSPEND_MODULES=${pkgname}" > "${pkgdir}/etc/pm/config.d/${pkgname}"
+    fi
 }
-
diff --git a/tn40xx.install b/tn40xx.install
index 72cf4b6ffefb..24ca4ca6088b 100644
--- a/tn40xx.install
+++ b/tn40xx.install
@@ -1,14 +1,13 @@
-
 post_install() {
-  _extramodules=extramodules-4.4-lts
-  depmod $(cat /usr/lib/modules/${_extramodules}/version)
+    # get latest installed kernel version. not the running one.
+    _kernver="$(basename `ls -dlt /usr/lib/modules/[2-4]* | head -n 1 | cut -d '/' -f 2-`)"
+    depmod ${_kernver}
 }
 
 post_upgrade() {
-  post_install
+    post_install
 }
 
 post_remove() {
-  post_install
+    post_install
 }
-