main/zfs-lts: fix -virt package

fix commit 9535467ba311c0cf811176c9f1de1a3d3a49988d, which should never
been merged.

Also update the missing checksum.

1 files changed, 18 insertions, 13 deletions

diff --git a/main/zfs-lts/APKBUILD b/main/zfs-lts/APKBUILD
index 84fa5444ef..806f4b3bac 100644
--- a/main/zfs-lts/APKBUILD
+++ b/main/zfs-lts/APKBUILD
@@ -15,14 +15,10 @@ _kpkgver="$_kver-r$_krel"
 
 # for custom kernels set $FLAVOR
 _extra_flavors=
-if [ -z "$FLAVOR" ]; then
-        _flavor=lts
-        case $CARCH in
+case $CARCH in
         x86|x86_64|aarch64) _extra_flavors="virt";;
-        esac
-else
-        _flavor=$FLAVOR
-fi
+esac
+
 _kpkg=linux-$_flavor
 _kabi="$_kver-$_krel-$_flavor"
 
@@ -38,6 +34,7 @@ provides="spl-vanilla" # Mitigate upgrade conflicts
 depends="$_kpkg=$_kpkgver"
 depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev
         $_kpkg-dev=$_kpkgver"
+
 makedepends="$depends_dev automake autoconf libtool linux-headers"
 install_if="zfs $_kpkg=$_kpkgver"
 subpackages="$pkgname-dev"
@@ -69,7 +66,9 @@ build() {
         local flavor= kabi=
         for flavor in $_flavor $_extra_flavors; do
                 kabi="$_kver-$_krel-$flavor"
-                ./configure --prefix=/usr \
+                mkdir -p "$kabi"
+                (cd $kabi
+                ../configure --prefix=/usr \
                         --with-tirpc \
                         --sysconfdir=/etc \
                         --mandir=/usr/share/man \
@@ -79,22 +78,28 @@ build() {
                         --with-linux=/usr/src/linux-headers-$kabi
 
                 make
+                )
         done
 }
 
 package() {
         cd "$builddir"
-        make DESTDIR="$pkgdir" install
+        local flavor= kabi=
+        for flavor in $_flavor $_extra_flavors; do
+                kabi="$_kver-$_krel-$flavor"
+                (cd $kabi && make DESTDIR="$pkgdir" install)
+        done
 }
 
 _extra() {
-        flavor=${subpkgname##*-}
+        local flavor=${subpkgname##*-}
         depends="linux-$flavor=$_kpkgver"
         install_if="linux-$flavor=$_kpkgver"
         pkgdesc="ZFS for Linux: kernel modules for $flavor"
 
-        cd "$builddir"
-        make DESTDIR="$subpkgdir" install
+        kabi="$_kver-$_krel-$flavor"
+        mkdir -p "$subpkgdir"/lib/modules
+        mv "$pkgdir"/lib/modules/$kabi "$subpkgdir"/lib/modules
 }
 
 dev() {
@@ -103,4 +108,4 @@ dev() {
         default_dev
 }
 
-sha512sums="aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010  zfs-0.8.3.tar.gz"
+sha512sums="9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1  zfs-0.8.4.tar.gz"