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

2 files changed, 55 insertions, 69 deletions

diff --git a/testing/ipt-netflow-vanilla/APKBUILD b/testing/ipt-netflow-vanilla/APKBUILD
index 03b0d2d1ca..a6379a8732 100644
--- a/testing/ipt-netflow-vanilla/APKBUILD
+++ b/testing/ipt-netflow-vanilla/APKBUILD
@@ -1,69 +1,53 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 
-_flavor=vanilla
+# when chaning _ver we *must* bump _rel
+_name=ipt-netflow
+_ver=2.3_pre20180201
+_rel=0
+
+_flavor=${FLAVOR:-vanilla}
 _kpkg=linux-$_flavor
 _kver=4.14.20
-_kpkgrel=0
+_krel=0
 
-# when chaning _ver we *must* bump _mypkgrel
-_ver=2.3_pre20180201
-
-_mypkgrel=0
+_kpkgver="$_kver-r$_krel"
+_kabi="$_kver-$_krel-$_flavor"
 
 # verify the kernel version before entering chroot
-if [ -f ../linux-${_flavor}/APKBUILD ]; then
-	. ../linux-${_flavor}/APKBUILD
-	pkgname=ipt-netflow-${_flavor}
-	[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-	[ "$_kpkgrel" != "$pkgrel" ] && die "please update _kpkgrel to $pkgrel"
+_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
 
-_kpkgver="$_kver-r$_kpkgrel"
-_abi_release=${_kver}-${_kpkgrel}-${_flavor}
-
-pkgname=ipt-netflow-${_flavor}
+pkgname=$_name-$_flavor
 pkgver=$_kver
+pkgrel=$(( $_krel + $_rel ))
 
-pkgrel=$(( $_kpkgrel + $_mypkgrel ))
 pkgdesc="Linux kernel netflow sensor module"
 url="http://ipt-netflow.sourceforge.net/"
 arch="x86 x86_64 armhf"
-license=GPL3+
-source="ipt-netflow-$_ver.tar.xz::http://turtle.dereferenced.org/~kaniini/ipt-netflow-$_ver.tar.xz
-	"
-#provides="ipt-netflow-grsec=${pkgver}-r${pkgrel}"
-depends="${_kpkg}=${_kpkgver}"
-depends_dev="$_kpkg-dev=$_kpkgver"
-makedepends="linux-${_flavor}-dev=$_kpkgver iptables-dev bash"
+license="GPL-3.0-or-later"
+depends="$_kpkg=$_kpkgver"
+makedepends="$_kpkg-dev=$_kpkgver iptables-dev bash"
 install_if="$_kpkg=$_kpkgver ipt-netflow"
-
-_builddir="$srcdir"/ipt-netflow-$_ver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+#provides="${_name}-grsec=${pkgver}-r${pkgrel}"
+source="ipt-netflow-$_ver.tar.xz::http://turtle.dereferenced.org/~kaniini/ipt-netflow-$_ver.tar.xz"
+builddir="$srcdir/$_name-$_ver"
 
 build() {
-        cd "$_builddir"
-        ./configure --kver=$_abi_release \
-		--ipt-inc=/usr/include/libiptc \
-		|| return 1
-	make ipt_NETFLOW.ko || return 1
+	cd "$builddir"
+	./configure --kver=$_kabi --ipt-inc=/usr/include/libiptc
+	make ipt_NETFLOW.ko
 }
 
 package() {
-        cd "$_builddir"
-        make -j1 minstall DEPMOD=: DESTDIR="$pkgdir" \
-		|| return 1
-}
-
-# override dev() from kernel's APKBUILD
-dev() {
-	default_dev
+	cd "$builddir"
+	make -j1 minstall DEPMOD=: DESTDIR="$pkgdir"
 }
 
 sha512sums="8216baf824380bceb9279c07a5314f7a3c21a140b82d83fdf31e123c11d7f8afdfc1942f7ac8a5d1af7fe980dc404c932a052b26839a01d99cc79334870c12b4  ipt-netflow-2.3_pre20180201.tar.xz"
diff --git a/testing/wireguard-vanilla/APKBUILD b/testing/wireguard-vanilla/APKBUILD
index 12c6529201..5b84bdfc3c 100644
--- a/testing/wireguard-vanilla/APKBUILD
+++ b/testing/wireguard-vanilla/APKBUILD
@@ -1,41 +1,43 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 
+# when changing _ver we *must* bump _rel
+# we must also match up _toolsrel with wireguard-tools
+_name=wireguard
+_ver=0.0.20180218
+_rel=0
+_toolsrel=0
+
 _flavor=${FLAVOR:-vanilla}
 _kpkg=linux-$_flavor
 _kver=4.14.20
-_kpkgrel=0
+_krel=0
 
-# when changing _ver we *must* bump _mypkgrel
-# we must also match up _toolsrel with wireguard-tools
-_ver=0.0.20180218
-_mypkgrel=0
-_toolsrel=0
-_name=wireguard
+_kpkgver="$_kver-r$_krel"
+_kabi="$_kver-$_krel-$_flavor"
 
 # verify the kernel version before entering chroot
-_kapkbuild=../../linux-${_flavor}/APKBUILD
+_kapkbuild=../../main/linux-vanilla/APKBUILD
 if [ -f $_kapkbuild ]; then
-	. $_kapkbuild
-	pkgname=$_name-$_flavor
-	[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
-	[ "$_kpkgrel" != "$pkgrel" ] && die "please update _kpkgrel to $pkgrel"
+	(	. $_kapkbuild
+		pkgname=$_name-$_flavor
+		[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
+		[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
+		return 0
+	)
 fi
 
-_kpkgver="$_kver-r$_kpkgrel"
-_toolsver="$_ver-r$toolsrel"
-_abi_release=${_kver}-${_kpkgrel}-${_flavor}
-
-pkgname=${_name}-${_flavor}
+pkgname=$_name-$_flavor
 pkgver=$_kver
-pkgrel=$(($_kpkgrel + $_mypkgrel))
+pkgrel=$(( $_krel + $_rel ))
+
 pkgdesc="Next generation secure network tunnel: kernel modules for $_flavor"
 arch='all'
 url='https://www.wireguard.com'
 license="GPL-2.0"
-depends="${_kpkg}=${_kpkgver}"
-makedepends="linux-vanilla-dev=$_kpkgver libmnl-dev"
-install_if="wireguard-tools=$_toolsver linux-vanilla=$_kpkgver"
+depends="$_kpkg=$_kpkgver"
+makedepends="$_kpkg-dev=$_kpkgver libmnl-dev"
+install_if="wireguard-tools=$_ver-r$toolsrel $_kpkg=$_kpkgver"
 options="!check"
 source="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-$_ver.tar.xz"
 builddir="$srcdir"/WireGuard-$_ver
@@ -45,7 +47,7 @@ build() {
 	# only building module: see wireguard-tools for userspace
 	unset LDFLAGS
 	make -C src/ \
-		KERNELDIR=/lib/modules/${_abi_release}/build \
+		KERNELDIR=/lib/modules/$_kabi/build \
 		module
 }
 
@@ -55,7 +57,7 @@ package() {
 	local module=
 	for module in *.ko; do
 		install -v -D -m644 ${module} \
-			"$pkgdir/lib/modules/$_abi_release/extra/${module}"
+			"$pkgdir/lib/modules/$_kabi/extra/${module}"
 	done
 }