aboutsummaryrefslogtreecommitdiffstats
path: root/main/zfs-rpi/APKBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'main/zfs-rpi/APKBUILD')
-rw-r--r--main/zfs-rpi/APKBUILD43
1 files changed, 26 insertions, 17 deletions
diff --git a/main/zfs-rpi/APKBUILD b/main/zfs-rpi/APKBUILD
index 42744e06960..61f86b20ffc 100644
--- a/main/zfs-rpi/APKBUILD
+++ b/main/zfs-rpi/APKBUILD
@@ -3,39 +3,50 @@
# when changing _ver we *must* bump _rel
_name=zfs
-_ver=2.1.1
-_rel=0
-
+_ver=2.2.3
+_rel=3
+# when changing _kver/_krel make sure _rel=0
_flavor=${FLAVOR:-rpi}
_kpkg=linux-$_flavor
-_kver=5.15.4
+_kver=6.6.21
_krel=0
_kpkgver="$_kver-r$_krel"
# for custom kernels set $FLAVOR
-_extra_flavors=rpi4
+case $CARCH in
+ armhf|armv7) _extra_flavors="";;
+ aarch64) _extra_flavors="";;
+esac
_kpkg=linux-$_flavor
_kabi="$_kver-$_krel-$_flavor"
pkgname=$_name-$_flavor
pkgver=$_kver
-pkgrel=$(( $_krel + $_rel ))
+pkgrel=$(( _krel + _rel ))
-pkgdesc="ZFS for Linux"
-url="https://zfsonlinux.org"
-arch="aarch64"
+pkgdesc="ZFS Linux kernel modules"
+url="https://openzfs.org"
+# armhf: NEON SIMD not available in BCM2835 (rpi1 & rpiZ)
+arch="aarch64 armv7"
license="CDDL-1.0"
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"
+makedepends="$depends_dev linux-headers xz"
install_if="zfs $_kpkg=$_kpkgver"
subpackages="$pkgname-dev"
-source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$_ver/zfs-$_ver.tar.gz"
+source="https://github.com/openzfs/zfs/releases/download/zfs-$_ver/zfs-$_ver.tar.gz
+ aarch64-disable-neon.patch
+ "
builddir="$srcdir/$_name-$_ver"
+options="!check"
+
+# secfixes:
+# 2.2.1-r1:
+# - CVE-2023-49298
for f in $_extra_flavors; do
makedepends="$makedepends linux-$f-dev=$_kpkgver"
@@ -45,7 +56,7 @@ done
prepare() {
default_prepare
# verify the kernel version
- local _kapkbuild=../../main/linux-$_flavor-/APKBUILD
+ local _kapkbuild="$startdir"/../../main/linux-$_flavor-/APKBUILD
if [ -f $_kapkbuild ]; then
( . $_kapkbuild
pkgname=$_name-$_flavor
@@ -54,11 +65,9 @@ prepare() {
return 0
)
fi
- autoreconf -vif
}
build() {
- cd "$builddir"
local flavor= kabi=
for flavor in $_flavor $_extra_flavors; do
kabi="$_kver-$_krel-$flavor"
@@ -79,7 +88,6 @@ build() {
}
package() {
- cd "$builddir"
local flavor= kabi=
for flavor in $_flavor $_extra_flavors; do
kabi="$_kver-$_krel-$flavor"
@@ -91,7 +99,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
@@ -105,5 +113,6 @@ dev() {
}
sha512sums="
-b69ce764a9f7438ec2c90f86be02abfd684c67cd38de876374e3e6f4b2f82a75d86fa70205def2ba454ad27e52ec8d955ebc4ba456e91d397129a54ea849c19c zfs-2.1.1.tar.gz
+e6c3df531a33f4bd198429e61b7630f1e965a03fd60d1b847bdf0d55c6d2af3abc38b5e8a63aa9ef9f969cc7eca36cb24a7641f6fb8c41ef2fa024d76cd28f3d zfs-2.2.3.tar.gz
+18966558e213b7516d3359884ced72618956db401cac32306662fa6304d3e31a28b030adcc8678704a30e6bbdee28120b2c6125e8285afacbb11a1645b39695a aarch64-disable-neon.patch
"