update for current kernels

2 files changed, 64 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47c80c20ff81..c61b2ecc09e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = openss7-git
 	pkgdesc = OpenSS7 Fast-STREAMS and Protocol Suites
-	pkgver = 1.1.8.69.gc04a4acaa
+	pkgver = 1.1.8.429.g4f07c8da6
 	pkgrel = 1
 	url = http://www.openss7.org
 	arch = x86_64
 	arch = i686
 	license = AGPL3
 	makedepends = doxygen
-	makedepends = gcc-gcj
+	makedepends = gcc6-gcj
 	makedepends = gcc-libs
 	makedepends = ghostscript
 	makedepends = gjdoc
@@ -30,8 +30,7 @@ pkgbase = openss7-git
 	makedepends = texlive-core
 	makedepends = transfig
 	makedepends = gawk
-	makedepends = java-environment
-	makedepends = lm_sensors
+	makedepends = classpath
 	makedepends = popt
 	makedepends = zip
 	makedepends = git
@@ -49,7 +48,6 @@ pkgname = openss7-git
 	install = openss7-git.install
 	depends = net-snmp
 	depends = gawk
-	depends = lm_sensors
 	depends = popt
 	optdepends = perl-tk: for graphical utilities
 	optdepends = gtkdialog: for graphical utilities
@@ -63,26 +61,24 @@ pkgname = openss7-git
 	options = !zipman
 	backup = etc/snmp/snmp.d/01openss7
 	backup = etc/sock2path.d/openss7
+	depends_x86_64 = lib32-glibc
 
 pkgname = openss7-modules-git
-	pkgdesc = OpenSS7 Fast-STREAMS and protocol Suites ( Kernel Modules)
-	install = openss7-modules-git.install
+	pkgdesc = OpenSS7 Fast-STREAMS and protocol Suites (ARCH Kernel Modules)
 	depends = openss7-git
 	depends = linux=
-	provides = openss7-kernel=1.1.8.69.gc04a4acaa
-	provides = openss7-modules=1.1.8.69.gc04a4acaa
+	provides = openss7-kernel=1.1.8.429.g4f07c8da6
+	provides = openss7-modules=1.1.8.429.g4f07c8da6
 	conflicts = openss7-modules
 	options = !emptydirs
 	options = !strip
 
 pkgname = openss7-modules-lts-git
-	pkgdesc = OpenSS7 Fast-STREAMS and protocol Suites ( Kernel Modules)
-	install = openss7-modules-lts-git.install
+	pkgdesc = OpenSS7 Fast-STREAMS and protocol Suites (LTS Kernel Modules)
 	depends = openss7-git
-	depends = linux-lts=
-	provides = openss7-modules-git=1.1.8.69.gc04a4acaa
-	provides = openss7-kernel=1.1.8.69.gc04a4acaa
-	provides = openss7-modules-lts=1.1.8.69.gc04a4acaa
+	depends = linux=
+	provides = openss7-kernel=1.1.8.429.g4f07c8da6
+	provides = openss7-modules-lts=1.1.8.429.g4f07c8da6
 	conflicts = openss7-modules-lts
 	options = !emptydirs
 	options = !strip
@@ -91,8 +87,8 @@ pkgname = openss7-java-git
 	pkgdesc = OpenSS7 Fast-STREAMS and Protocol Suites (Java)
 	install = openss7-java-git.install
 	depends = openss7-git
-	depends = gcc-gcj
-	depends = java-environment
-	provides = openss7-java=1.1.8.69.gc04a4acaa
+	depends = gcc6-gcj
+	depends = classpath
+	provides = openss7-java=1.1.8.429.g4f07c8da6
 	conflicts = openss7-java
 
diff --git a/PKGBUILD b/PKGBUILD
index f5344e6b3224..70b583a8c2f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgbase=openss7-git
 _pkgbase=openss7
 pkgname=('openss7-git' 'openss7-modules-git' 'openss7-modules-lts-git' 'openss7-java-git')
-pkgver=1.1.8.69.gc04a4acaa
+pkgver=1.1.8.429.g4f07c8da6
 pkgrel=1
 pkgdesc="OpenSS7 Fast-STREAMS and Protocol Suites"
 arch=('x86_64' 'i686')
@@ -43,12 +43,15 @@ build() {
   _cache_file=../$CARCH-config.cache
 
   _knm="-lts"
+  _kvd="4.19.92-1"
+  _kvo=""
   _kvv="$(pacman -Si linux${_knm}|awk '/^Version/{print$3}')" || \
   _kvv="$(pacman -Qi linux${_knm}|awk '/^Version/{print$3}')"
-  _kvv="${_kvv:-4.19.84-1}"
+  _kvv="${_kvv:-${_kvd}}"
   _kvr="${_kvv:+${_kvv}${_knm}}"
   _kvx="$(echo $_kvr|sed -e 's,\.[0-9][0-9]*-.*,,')"
 
+
   ./configure \
       KCC="gcc" \
       GCJ="gcj" \
@@ -82,11 +85,20 @@ build() {
       --with-optimize=speed \
       --with-gnu-ld \
       --disable-modules
+  # Fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
   make
 
   cd "$srcdir/openss7-modules-lts-git"
 
-  _kvr="$(pacman -Qi linux-lts|awk '/^Version/{print$3}')-lts"
+  _knm="-lts"
+  _kvd="4.19.92-1"
+  _kvo=""
+  _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]*-.*,,')"
 
   _csite_file=../$CARCH-config.site
   _mpost_file=../$CARCH-$_kvr-modpost.cache
@@ -131,7 +143,15 @@ build() {
 
   cd "$srcdir/openss7-modules-git"
 
-  _kvr="$(pacman -Qi linux|awk '/^Version/{print$3}')-ARCH"
+  _knm=""
+  _kvd="5.4.7-arch1-1"
+  _kvo=""
+  _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}}"
+  _kvr="$(echo $_kvr|sed -e 's,\.arch,-arch,')"
+  _kvx="$(echo $_kvr|sed -e 's,\.arch*,,')"
 
   _csite_file=../$CARCH-config.site
   _mpost_file=../$CARCH-$_kvr-modpost.cache
@@ -214,17 +234,20 @@ package_openss7-git() {
 
 package_openss7-modules-git() {
   _knm=""
+  _kvd="5.4.7-arch1-1"
+  _kvo=""
   _kvv="$(pacman -Si linux${_knm}|awk '/^Version/{print$3}')" || \
   _kvv="$(pacman -Qi linux${_knm}|awk '/^Version/{print$3}')"
-  _kvv="${_kvv:-5.3.11.1-1}"
+  _kvv="${_kvv:-${_kvd}}"
   _kvr="${_kvv:+${_kvv}${_knm}}"
-  _kvx="$(echo $_kvr | sed -e 's,\.[0-9][0-9]*-.*,,')"
-  _kvn="$(echo $_kvr | sed -e 's,-.*$,,')"
-  _kvl="$(echo $_kvr | sed -e 's,\.[0-9][0-9]*-.*$,,')"
-  _kvi="$(echo $_kvl | sed -e 's,.*\.,,')"
-  _kvi=$((_kvi+1))
-  _kvu="3.$_kvi"
-  pkgdesc="OpenSS7 Fast-STREAMS and protocol Suites ($_kvx Kernel Modules)"
+  _kvr="$(echo $_kvr|sed -e 's,\.arch,-arch,')"
+  _kvx="$(echo $_kvr|sed -e 's,\.arch*,,')"
+# _kvn="$(echo $_kvr | sed -e 's,-.*$,,')"
+# _kvl="$(echo $_kvr | sed -e 's,\.[0-9][0-9]*-.*$,,')"
+# _kvi="$(echo $_kvl | sed -e 's,.*\.,,')"
+# _kvi=$((_kvi+1))
+# _kvu="5.$_kvi"
+  pkgdesc="OpenSS7 Fast-STREAMS and protocol Suites (${_kvx:-ARCH} Kernel Modules)"
   provides=("$_pkgbase-kernel=$pkgver"
             "$_pkgbase-modules=$pkgver")
   conflicts=("$_pkgbase-modules")
@@ -254,26 +277,27 @@ package_openss7-modules-git() {
 # install -d "$pkgdir"/usr/lib/modules/extramodules-${_kvx}${_knm}
 # mv -f "$pkgdir"/usr/lib/modules/${_kvr}/extramodules/openss7 \
 #       "$pkgdir"/usr/lib/modules/extramodules-${_kvx}${_knm}
-  install -d "$pkgdir/usr/src/$_pkgname-$pkgver-$pkgrel"
+  install -d "$pkgdir"/usr/src
   ln -s ../lib/modules/${_kvr}/build/openss7 \
-        "$pkgdir/usr/src/${_pkgname}-$pkgver-$pkgrel/$_kvr"
+        "$pkgdir"/usr/src/$_pkgbase-modules-$pkgver-$pkgrel
 }
 
 package_openss7-modules-lts-git() {
   _knm="-lts"
+  _kvd="4.19.92-1"
+  _kvo=""
   _kvv="$(pacman -Si linux${_knm}|awk '/^Version/{print$3}')" || \
   _kvv="$(pacman -Qi linux${_knm}|awk '/^Version/{print$3}')"
-  _kvv="${_kvv:-4.19.84-1}"
+  _kvv="${_kvv:-${_kvd}}"
   _kvr="${_kvv:+${_kvv}${_knm}}"
   _kvx="$(echo $_kvr|sed -e 's,\.[0-9][0-9]*-.*,,')"
-  _kvn="$(echo $_kvr | sed -e 's,-.*$,,')"
-  _kvl="$(echo $_kvr | sed -e 's,\.[0-9][0-9]*-.*$,,')"
-  _kvi="$(echo $_kvl | sed -e 's,.*\.,,')"
-  _kvi=$((_kvi+1))
-  _kvu="3.$_kvi"
-  pkgdesc="OpenSS7 Fast-STREAMS and protocol Suites ($_kvx Kernel Modules)"
-  provides=("$_pkgbase-modules-git=$pkgver"
-            "$_pkgbase-kernel=$pkgver"
+# _kvn="$(echo $_kvr | sed -e 's,-.*$,,')"
+# _kvl="$(echo $_kvr | sed -e 's,\.[0-9][0-9]*-.*$,,')"
+# _kvi="$(echo $_kvl | sed -e 's,.*\.,,')"
+# _kvi=$((_kvi+1))
+# _kvu="4.$_kvi"
+  pkgdesc="OpenSS7 Fast-STREAMS and protocol Suites (${_kvx:-LTS} Kernel Modules)"
+  provides=("$_pkgbase-kernel=$pkgver"
             "$_pkgbase-modules-lts=$pkgver")
   conflicts=("$_pkgbase-modules-lts")
   depends=("$pkgbase" "linux${_knm}=$_kvv")
@@ -287,9 +311,9 @@ package_openss7-modules-lts-git() {
   rm -fr "$pkgdir/usr/share/doc"
   d="$pkgdir/usr/lib/modules/${_kvr}/build/openss7"
   install -d "$d"
-  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"
@@ -302,9 +326,9 @@ package_openss7-modules-lts-git() {
 # install -d "$pkgdir"/usr/lib/modules/extramodules-${_kvx}${_knm}
 # mv -f "$pkgdir"/usr/lib/modules/${_kvr}/extramodules/openss7 \
 #       "$pkgdir"/usr/lib/modules/extramodules-${_kvx}${_knm}
-  install -d "$pkgdir/usr/src/$_pkgname-$pkgver-$pkgrel"
+  install -d "$pkgdir"/usr/src
   ln -s ../lib/modules/${_kvr}/build/openss7 \
-        "$pkgdir/usr/src/${_pkgname}-$pkgver-$pkgrel/$_kvr"
+        "$pkgdir"/usr/src/$_pkgbase-modules-lts-$pkgver-$pkgrel
 }
 
 package_openss7-java-git() {