Revert "testing/jool: refactor aport, handle all flavors as subpackages"

This reverts commit 4f7bd6ea4fb87f7cab69141bf29924ded805863c.

Okay, it actually makes more sense as it was originally. However,
I still consider it quite messy and confusing...

1 files changed, 38 insertions, 25 deletions

diff --git a/testing/jool/APKBUILD b/testing/jool/APKBUILD
index 816315f779..f640b3e7a3 100644
--- a/testing/jool/APKBUILD
+++ b/testing/jool/APKBUILD
@@ -3,54 +3,60 @@
 
 # jool version
 # when changing _ver we *must* bump _rel!
+_name=jool
 _ver=4.0.6
-_rel=2
+_rel=1
+
+# for custom kernels set $FLAVOR
+_flavor="$FLAVOR"
+_extra_flavors=""
+if [ -z "$FLAVOR" ]; then
+	_flavor=vanilla
+	case $CARCH in
+		x86 | x86_64) _extra_flavors="virt";;
+	esac
+fi
 
 # kernel verson
+_kpkg=linux-$_flavor
 _kver=4.19.80
 _krel=0
+
 _kpkgver="$_kver-r$_krel"
+_kabi="$_kver-$_krel-$_flavor"
 
-pkgname=jool
+pkgname=$_name-$_flavor
 pkgver=$_kver
 pkgrel=$(( $_krel + $_rel ))
-pkgdesc="SIIT and NAT64 for Linux (virtual package for kernel modules)"
+pkgdesc="SIIT and NAT64 for Linux (kernel modules for $_flavor)"
 url="https://jool.mx"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="linux-headers"
-install_if="jool-tools $pkgname=$pkgver-r$pkgrel"
+depends="$_kpkg=$_kpkgver"
+makedepends="$_kpkg-dev=$_kpkgver linux-headers"
+install_if="$_kpkg=$_kpkgver $_name"
 subpackages=""
-source="https://github.com/NICMx/Jool/releases/download/v$_ver/$pkgname-$_ver.tar.gz"
-builddir="$srcdir/$pkgname-$_ver"
+source="https://github.com/NICMx/Jool/releases/download/v$_ver/$_name-$_ver.tar.gz"
+builddir="$srcdir/$_name-$_ver"
 options="!check"
 
-# for custom kernels set $FLAVOR
-_flavors="$FLAVOR"
-if [ -z "$_flavors" ]; then
-	_flavors="vanilla"
-	case $CARCH in
-		x86 | x86_64) _flavors="$_flavors virt";;
-	esac
-fi
-
-for _f in $_flavors; do
+for _f in $_extra_flavors; do
 	makedepends="$makedepends linux-$_f-dev=$_kpkgver"
-	subpackages="$subpackages $pkgname-$_f:_module"
+	subpackages="$subpackages $_name-$_f:_extra"
 done
 
 prepare() {
 	default_prepare
 
 	if [ -z "$FLAVOR" ]; then
-		(	. "$startdir"/../../main/linux-${_flavors%% *}/APKBUILD
+		(	. "$startdir"/../../main/linux-$_flavor/APKBUILD
 			[ "$_kver" != "$pkgver" ] && die "please update _kver to $pkgver"
 			[ "$_krel" != "$pkgrel" ] && die "please update _krel to $pkgrel"
 			return 0
 		)
 	fi
 
-	local flavor; for flavor in $_flavors; do
+	local flavor; for flavor in $_flavor $_extra_flavors; do
 		cp -r "$builddir" "$srcdir"/$flavor
 	done
 }
@@ -58,25 +64,32 @@ prepare() {
 build() {
 	unset LDFLAGS
 
-	local flavor; for flavor in $_flavors; do
+	local flavor; for flavor in $_flavor $_extra_flavors; do
 		make -C "$srcdir"/"$flavor"/src/mod \
 			MODULES_DIR="/lib/modules/$_kver-$_krel-$flavor"
 	done
 }
 
 package() {
-	mkdir -p "$pkgdir"
+	_modules_install "$_flavor" "$pkgdir"
 }
 
-_module() {
+_extra() {
 	local flavor=${subpkgname##*-}
 	depends="linux-$flavor=$_kpkgver"
-	install_if="$pkgname=$pkgver-$pkgrel linux-$flavor=$_kpkgver"
+	install_if="linux-$flavor=$_kpkgver $_name"
 	pkgdesc="SIIT and NAT64 for Linux (kernel modules for $flavor)"
 
+	_modules_install "$flavor" "$subpkgdir"
+}
+
+_modules_install() {
+	local flavor="$1"
+	local destdir="$2"
+
 	make -C "$srcdir"/$flavor/src/mod modules_install \
 		MODULES_DIR=/lib/modules/$_kver-$_krel-$flavor \
-		INSTALL_MOD_PATH="$subpkgdir"
+		INSTALL_MOD_PATH="$destdir"
 }
 
 sha512sums="8648cc876d801b34c4bc9616da642727d1e49ed2937daa7fdca58c0fd80dbd1c432018af410c44c1d24224aba5289f726f43adc259cdf8193832d39a86d0f6a6  jool-4.0.6.tar.gz"