[kmodule]-vanilla: clean up, streamline, modernize

1 files changed, 39 insertions, 41 deletions

diff --git a/main/devicemaster-linux-vanilla/APKBUILD b/main/devicemaster-linux-vanilla/APKBUILD
index 075b31aed1..fc623393fc 100644
--- a/main/devicemaster-linux-vanilla/APKBUILD
+++ b/main/devicemaster-linux-vanilla/APKBUILD
@@ -1,58 +1,56 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
-_flavor=vanilla
+# when changing _ver we *must* bump _rel
+_name=devicemaster-linux
+_ver=7.26
+_rel=0
+
+_flavor=${FLAVOR:-vanilla}
 _kpkg=linux-$_flavor
 _kver=4.14.20
-_kpkgrel=0
-_mypkgrel=0
+_krel=0
+
+_kpkgver="$_kver-r$_krel"
+_kabi="$_kver-$_krel-$_flavor"
 
-_kpkgver="$_kver-r$_kpkgrel"
-_abi_release=${_kver}-${_kpkgrel}-${_flavor}
-_realname=devicemaster-linux
+# verify the kernel version before entering chroot
+_kapkbuild=../../main/linux-vanilla/APKBUILD
+if [ -f $_kapkbuild ]; then
+	(	. $_kapkbuild
+		pkgname=$_name-$_flavor
+		[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+		[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+		return 0
+	)
+fi
 
-pkgname=${_realname}-${_flavor}
+pkgname=$_name-$_flavor
 pkgver=$_kver
-# when changing _realver we *must* bump _mypkgrel
-_realver=7.26
-pkgrel=$(( $_kpkgrel + $_mypkgrel ))
-pkgdesc="NS-Link Device Drivers $_realver for linux-$_flavor"
+pkgrel=$(( $_krel + $_rel ))
+
+pkgdesc="NS-Link Device Drivers $_ver for $_kpkg"
 url="http://www.comtrol.com/resources/product-resources-white-papers/ns-link-device-drivers"
 arch="x86 x86_64 armhf"
-license="GPL"
-depends="linux-${_flavor}=${_kpkgver}"
-makedepends="linux-${_flavor}-dev=${_kpkgver} linux-headers"
-install=
-install_if="$_kpkg=$_kpkgver $_realname"
-subpackages=""
-provides="${_realname}-grsec=${pkgver}-r${pkgrel}"
-source="http://dev.alpinelinux.org/archive/devicemaster-linux/devicemaster-linux-$_realver.tar.gz
-	"
-
-builddir="$srcdir"/devicemaster-linux-$_realver
-prepare() {
-	# verify the kernel version
-	(if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
-		_name=$pkgname
-		. ../../main/linux-${_flavor}/APKBUILD
-		pkgname=$_name
-		[ "$_kver" != "$pkgver" ] \
-			&& die "please update _kver to $pkgver"
-		[ "$_kpkgrel" != "$pkgrel" ] \
-			&& die "please update _kpkgrel to $pkgrel"
-	fi)
-	default_prepare
-}
+license="GPL-2.0"
+depends="$_kpkg=$_kpkgver"
+makedepends="$_kpkg-dev=$_kpkgver linux-headers"
+install_if="$_kpkg=$_kpkgver $_name"
+#provides="${_name}-grsec=${pkgver}-r${pkgrel}"
+source="http://dev.alpinelinux.org/archive/devicemaster-linux/devicemaster-linux-$_ver.tar.gz"
+builddir="$srcdir"/$_name-$_ver
+
+# grsec legacy
+[ "$_flavor" = "hardened" ] && provides="$_name-grsec=$pkgver-r$pkgrel"
 
 build() {
-	cd "$srcdir/$_realname-$_realver"
-	make -C /lib/modules/$_abi_release/build SUBDIRS="$PWD" modules \
-		V=1
+	cd "$srcdir/$_name-$_ver"
+	make -C /lib/modules/$_kabi/build SUBDIRS="$PWD" modules V=1
 }
 
 package() {
-	cd "$srcdir/$_realname-$_realver"
-	mkdir -p "$pkgdir/lib/modules/${_abi_release}/misc/"
-	cp *.ko "$pkgdir/lib/modules/${_abi_release}/misc/"
+	cd "$srcdir/$_name-$_ver"
+	mkdir -p "$pkgdir/lib/modules/$_kabi/misc/"
+	cp *.ko "$pkgdir/lib/modules/$_kabi/misc/"
 }
 
 sha512sums="5ae164645824018b99e8e8917d81f336fdef5745cb43fb93582c4e61f58a5c005202c19fcc8b13a4a24f4fc94287bf11f496b447db62bbf67b07da5793a9d8f7  devicemaster-linux-7.26.tar.gz"