Merge branch 'master' of file:///u2/code/ubs/openss7-modules-lts316-git

1 files changed, 22 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3d550b5a4aea..77342dce41ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,25 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
-_kvv="$(pacman -Si linux-lts316|awk '/^Version/{print$3}')"
+_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}"
 _kvx="$(echo $_kvr|sed -e 's,\.[0-9][0-9]*-.*,,')"
 pkgname=openss7-modules-lts316-git
 _pkgname=openss7-modules-lts316
-pkgver=1.1.8.75.g3a80da6cc
-pkgrel=1
+pkgver=1.1.8.421.g6bc14a626
+pkgrel=4
 pkgdesc="OpenSS7 Fast-STREAMS and protocol Suites (${_kvx:-LTS 3.16} 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}")
-makedepends=('doxygen' 'gcc6-gcj' 'gcc-libs' 'ghostscript' 'glibc' 'gnupg'
-             'gnuplot' 'imagemagick' 'latex2html' 'linux-lts316'
-             'linux-lts316-headers' 'gcc5' 'lsof' 'net-snmp' 'openssl' 'swig'
-             'systemd' 'tcl' 'texlive-bin' 'texlive-core' 'transfig' 'gawk'
-             'lm_sensors' 'popt' 'git')
+makedepends=('git' 'doxygen' 'gcc6-gcj' 'gcc-libs' 'ghostscript' 'gjdoc' 'glibc'
+	     'gnupg' 'gnuplot' 'imagemagick' 'latex2html'
+             'linux-lts316' 'linux-lts316-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')
@@ -43,8 +46,9 @@ build() {
   _cache_file=../$CARCH-$_kvr-config.cache
 
   ./configure \
-      GCC="gcc-5" \
-      KCC="gcc-5" \
+      KCC="gcc" \
+      GCJ="gcj" \
+      CXX="g++-6" \
       CPPFLAGS="$CPPFLAGS" \
       CFLAGS="$CFLAGS" \
       CXXFLAGS="$CXXFLAGS" \
@@ -70,12 +74,13 @@ build() {
       --enable-k-weak-modules \
       --disable-specfs-lock \
       --with-k-release=$_kvr \
+      --with-k-subdir=extramodules/openss7 \
       --with-k-optimize=speed \
       --with-optimize=speed \
       --with-gnu-ld \
       --disable-docs \
       --disable-tools
-  make
+  make -j1
 }
 
 package() {
@@ -84,31 +89,26 @@ package() {
   rm -fr "$pkgdir/usr/bin"
   rm -fr "$pkgdir/usr/lib/openss7"
   rm -fr "$pkgdir/usr/share/doc"
-  d="$pkgdir/usr/src/$_pkgname-$pkgver-$pkgrel/$_kvr"
+  d="$pkgdir/usr/lib/modules/${_kvr}/build/openss7"
   install -d "$d"
-  b="$pkgdir/boot"
-  install -d "$b"
-  install -m644 ../$CARCH-$_kvr-config.cache     "$d"
   install -m644 ../$CARCH-config.site            "$d"
   install -m644 ../$CARCH-$_kvr-modpost.cache    "$d"
+  install -m644 ../$CARCH-$_kvr-config.cache     "$d"
   install -m644 Module.mkvars                    "$d"
   install -m644 System.symvers                   "$d"
   install -m644 Module.symvers                   "$d"
   install -m644 config.h                         "$d"
   cat System.symvers Module.symvers | gzip -9 -c >symvers-${_kvr}.gz
   install -m644 symvers-${_kvr}.gz               "$d"
-  install -m644 symvers-${_kvr}.gz               "$b"
   cat Module.symvers|awk '{print$4"\t"$3"\t"$1"\t"$2}' >abi-${_kvr}
   install -m644 abi-${_kvr}                      "$d"
-  install -m644 abi-${_kvr}                      "$b"
   install -m644 symsets-${_kvr}.tar.gz           "$d"
-  install -m644 symsets-${_kvr}.tar.gz           "$b"
   install -d "$pkgdir"/usr/lib/modules/extramodules-${_kvx}-lts316
-  mv -f "$pkgdir"/usr/lib/modules/${_kvr}/updates/openss7 \
+  mv -f "$pkgdir"/usr/lib/modules/${_kvr}/extramodules/openss7 \
         "$pkgdir"/usr/lib/modules/extramodules-${_kvx}-lts316
-  install -d "$pkgdir"/usr/lib/modules/${_kvr}/build/openss7
-  mv -f "$pkgdir"/usr/src/${_pkgname}-$pkgver-$pkgrel/$_kvr \
-        "$pkgdir"/usr/lib/modules/${_kvr}/build/openss7
+  install -d "$pkgdir/usr/src/$_pkgname-$pkgver-$pkgrel"
+  ln -s ../../lib/modules/${_kvr}/build/openss7 \
+        "$pkgdir/usr/src/${_pkgname}-$pkgver-$pkgrel/$_kvr"
 }
 
 # vim: sw=2 et