From b166b3e08c549271129f3a79c12b51b107dc1f23 Mon Sep 17 00:00:00 2001
From: omni <omni+alpine@hack.org>
Date: Thu, 31 Mar 2022 00:04:14 +0000
Subject: [PATCH] main/zfs-lts: upgrade to 2.1.4 / kernel 5.15.34-r0
Update upstream URL and pkgdesc. By 2.0.0 ZoL became OpenZFS and is a
common effort with FreeBSD developers.
Enable on armv7 and s390x.
---
main/zfs-lts/APKBUILD | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/main/zfs-lts/APKBUILD b/main/zfs-lts/APKBUILD
index 21ca4458d278..704599d9acbf 100644
--- a/main/zfs-lts/APKBUILD
+++ b/main/zfs-lts/APKBUILD
@@ -3,12 +3,12 @@
# when changing _ver we *must* bump _rel
_name=zfs
-_ver=2.1.2
+_ver=2.1.4
_rel=0
_flavor=${FLAVOR:-lts}
_kpkg=linux-$_flavor
-_kver=5.15.32
+_kver=5.15.34
_krel=0
_kpkgver="$_kver-r$_krel"
@@ -26,9 +26,9 @@ pkgname=$_name-$_flavor
pkgver=$_kver
pkgrel=$(( $_krel + $_rel ))
-pkgdesc="ZFS for Linux"
-url="https://zfsonlinux.org"
-arch="x86 x86_64 aarch64 ppc64le"
+pkgdesc="ZFS Linux kernel modules"
+url="https://openzfs.org"
+arch="all !armhf !riscv64" # limited by linux-lts
license="CDDL-1.0"
provides="spl-vanilla" # Mitigate upgrade conflicts
depends="$_kpkg=$_kpkgver"
@@ -97,7 +97,7 @@ _extra() {
local flavor=${subpkgname##*-}
depends="linux-$flavor=$_kpkgver"
install_if="zfs linux-$flavor=$_kpkgver"
- pkgdesc="ZFS for Linux: kernel modules for $flavor"
+ pkgdesc="ZFS Linux kernel modules for $flavor"
kabi="$_kver-$_krel-$flavor"
mkdir -p "$subpkgdir"/lib/modules
@@ -111,6 +111,6 @@ dev() {
}
sha512sums="
-3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 zfs-2.1.2.tar.gz
+c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e zfs-2.1.4.tar.gz
2643a55f9aef3f3a4e9242d4ae1377d28ae8ca9b31b2e87eb19e8f0d32ef24ba03ec39d776553fcd38b77b407696f00224c129d4f3b16f0e36b49279055d2d87 4900-ppc-get-user-workaround.patch
"
--
GitLab