rationalize module packages

3 files changed, 24 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ac28a048ee4..d9353e10b7ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = openss7-modules-lts316-git
 	pkgdesc = OpenSS7 Fast-STREAMS and protocol Suites (3.16 Kernel Modules)
 	pkgver = 1.1.8.421.g6bc14a626
-	pkgrel = 4
+	pkgrel = 6
 	url = http://www.openss7.org
-	install = openss7-modules-lts316-git.install
 	arch = x86_64
 	arch = i686
 	license = AGPL3
@@ -12,6 +11,7 @@ pkgbase = openss7-modules-lts316-git
 	makedepends = gcc6-gcj
 	makedepends = gcc-libs
 	makedepends = ghostscript
+	makedepends = gjdoc
 	makedepends = glibc
 	makedepends = gnupg
 	makedepends = gnuplot
@@ -31,7 +31,7 @@ pkgbase = openss7-modules-lts316-git
 	makedepends = gawk
 	makedepends = classpath
 	makedepends = popt
-	depends = linux-lts316=3.16.76-1
+	depends = linux-lts316=3.16.77-1
 	provides = openss7-modules-lts316=1.1.8.421.g6bc14a626
 	conflicts = openss7-modules-lts316
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 77342dce41ef..c9ad97ca3c58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,31 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
-_kvv="$(pacman -Si linux-lts316|awk '/^Version/{print$3}')" || \
-_kvv="$(pacman -Qi linux-lts316|awk '/^Version/{print$3}')"
-_kvv="${_kvv:-3.16.77-1}"
-_kvr="${_kvv:+${_kvv}-lts316}"
+_knm="-lts316"
+_kvd="3.16.77-1"
+_kvo="!makeflags"
+_kvv="$(pacman -Si linux${_knm}|awk '/^Version/{print$3}')" || \
+_kvv="$(pacman -Qi linux${_knm}|awk '/^Version/{print$3}')"
+_kvv="${_kvv:-${_kvd}}"
+_kvr="${_kvv:+${_kvv}${_knm}}"
 _kvx="$(echo $_kvr|sed -e 's,\.[0-9][0-9]*-.*,,')"
-pkgname=openss7-modules-lts316-git
-_pkgname=openss7-modules-lts316
+pkgname=openss7-modules${_knm}-git
+_pkgname=openss7-modules${_knm}
 pkgver=1.1.8.421.g6bc14a626
-pkgrel=4
-pkgdesc="OpenSS7 Fast-STREAMS and protocol Suites (${_kvx:-LTS 3.16} Kernel Modules)"
+pkgrel=6
+pkgdesc="OpenSS7 Fast-STREAMS and protocol Suites (${_kvx:-LTS ${_kvx}} Kernel Modules)"
 arch=('x86_64' 'i686')
 url="http://www.openss7.org"
 license=('AGPL3')
-depends=("linux-lts316${_kvv:+=$_kvv}")
-#depends=("openss7-git" "linux-lts316${_kvv:+=$_kvv}")
+depends=("linux${_knm}${_kvv:+=$_kvv}")
+#depends=("openss7-git" "linux${_knm}${_kvv:+=$_kvv}")
 makedepends=('git' 'doxygen' 'gcc6-gcj' 'gcc-libs' 'ghostscript' 'gjdoc' 'glibc'
 	     'gnupg' 'gnuplot' 'imagemagick' 'latex2html'
-             'linux-lts316' 'linux-lts316-headers'
+             "linux${_knm}" "linux${_knm}-headers"
              'lsof' 'net-snmp' 'openssl' 'swig' 'systemd' 'tcl' 'texlive-bin'
 	     'texlive-core' 'transfig' 'gawk' 'classpath'
              'popt')
 conflicts=($_pkgname)
 provides=("$_pkgname=$pkgver")
-options=('!emptydirs' '!strip' '!makeflags')
-install="$pkgname.install"
+options=('!emptydirs' '!strip' ${_kvo})
 source=("$pkgname::git+https://github.com/openss7/openss7.git")
 md5sums=('SKIP')
 
@@ -103,12 +105,13 @@ package() {
   cat Module.symvers|awk '{print$4"\t"$3"\t"$1"\t"$2}' >abi-${_kvr}
   install -m644 abi-${_kvr}                      "$d"
   install -m644 symsets-${_kvr}.tar.gz           "$d"
-  install -d "$pkgdir"/usr/lib/modules/extramodules-${_kvx}-lts316
+  install -d "$pkgdir"/usr/lib/modules/extramodules-${_kvx}${_knm}
   mv -f "$pkgdir"/usr/lib/modules/${_kvr}/extramodules/openss7 \
-        "$pkgdir"/usr/lib/modules/extramodules-${_kvx}-lts316
-  install -d "$pkgdir/usr/src/$_pkgname-$pkgver-$pkgrel"
-  ln -s ../../lib/modules/${_kvr}/build/openss7 \
-        "$pkgdir/usr/src/${_pkgname}-$pkgver-$pkgrel/$_kvr"
+        "$pkgdir"/usr/lib/modules/extramodules-${_kvx}${_knm}
+  rm -fr "$pkgdir"/usr/src
+  install -d "$pkgdir"/usr/src
+  ln -s ../lib/modules/${_kvr}/build/openss7 \
+        "$pkgdir"/usr/src/${_pkgname}-$pkgver-$pkgrel
 }
 
 # vim: sw=2 et
diff --git a/openss7-modules-lts316-git.install b/openss7-modules-lts316-git.install
deleted file mode 100644
index 1fc4304e1438..000000000000
--- a/openss7-modules-lts316-git.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.16-lts316'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.16-lts316'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.16-lts316'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-