aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.dk>2018-04-17 23:23:40 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2018-04-23 20:05:17 +0000
commitbba0908d4a114da3cd12b4a779a512e1ec22e3e2 (patch)
tree8d49ad611cac26b7da165765b1b16a096175b919
parent3dea5a595bf4cafedbcc940fcfdc20be84ff88a8 (diff)
downloadaports-bba0908d4a114da3cd12b4a779a512e1ec22e3e2.tar.gz
aports-bba0908d4a114da3cd12b4a779a512e1ec22e3e2.tar.bz2
aports-bba0908d4a114da3cd12b4a779a512e1ec22e3e2.tar.xz
main/zfs: upgrade to 0.7.8, modernize
Fix for "Unlistable and disappearing files" introduced in 0.7.7: https://github.com/zfsonlinux/zfs/issues/7401 https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.7.8
-rw-r--r--main/zfs/APKBUILD37
1 files changed, 13 insertions, 24 deletions
diff --git a/main/zfs/APKBUILD b/main/zfs/APKBUILD
index 07ae8d7f3d..b32327b4f7 100644
--- a/main/zfs/APKBUILD
+++ b/main/zfs/APKBUILD
@@ -1,28 +1,21 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
pkgname=zfs
-pkgver=0.7.7
+pkgver=0.7.8
pkgrel=0
pkgdesc="ZFS for Linux"
url="http://zfsonlinux.org"
arch="all !armhf"
license="CDDL"
-depends=""
depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev attr-dev"
makedepends="$depends_dev automake autoconf libtool linux-headers"
-install=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dracut
- $pkgname-udev $pkgname-scripts $pkgname-utils-py:utils_py"
-source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz
- "
-
-
-builddir="$srcdir/$pkgname-$pkgver"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dracut::noarch
+ $pkgname-udev $pkgname-scripts $pkgname-utils-py:utils_py:noarch"
+source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz"
prepare() {
default_prepare
- autoreconf -vif || return 1
+ autoreconf -vif
}
build() {
@@ -36,14 +29,13 @@ build() {
--localstatedir=/var \
--with-config=user \
--with-udevdir=/lib/udev \
- --disable-systemd \
- || return 1
- make || return 1
+ --disable-systemd
+ make
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/share/initramfs-tools
mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
}
@@ -51,22 +43,19 @@ package() {
dracut() {
pkgdesc="$pkgdesc (dracut)"
mkdir -p "$subpkgdir"/usr/lib
- mv "$pkgdir"/usr/lib/dracut \
- "$subpkgdir"/usr/lib || return 1
+ mv "$pkgdir"/usr/lib/dracut "$subpkgdir"/usr/lib
}
udev() {
pkgdesc="$pkgdesc (udev)"
mkdir -p "$subpkgdir"/lib
- mv "$pkgdir"/lib/udev \
- "$subpkgdir"/lib || return 1
+ mv "$pkgdir"/lib/udev "$subpkgdir"/lib
}
scripts() {
pkgdesc="$pkgdesc (scripts)"
mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/zfs \
- "$subpkgdir"/usr/share || return 1
+ mv "$pkgdir"/usr/share/zfs "$subpkgdir"/usr/share
}
utils_py() {
@@ -74,8 +63,8 @@ utils_py() {
depends="python2"
mkdir -p "$subpkgdir"/usr/bin
for i in "$pkgdir"/usr/bin/*.py; do
- mv $i "$subpkgdir"/usr/bin || return 1
+ mv $i "$subpkgdir"/usr/bin
done
}
-sha512sums="ee935459994ed3ec2e50c3d89f0d79e4e24d58aebb035b5ddac53898181fdb00337de05b0d3a2e3692ce8b08b94a75459041153ed27971d6e896b88c44b74b14 zfs-0.7.7.tar.gz"
+sha512sums="cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35 zfs-0.7.8.tar.gz"