summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2018-11-07 17:30:42 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2018-11-07 17:30:42 +0100
commitbbf6fb68ba69c72bfa014a3c21a9e99772eb44f2 (patch)
tree9a6338d531de91ff62b3ae8aeaf4d1edba0a75f8
parent29253e5e89f8d2874f7e7970189994df45d65dab (diff)
downloadcogitri-bbf6fb68ba69c72bfa014a3c21a9e99772eb44f2.tar.gz
cogitri-bbf6fb68ba69c72bfa014a3c21a9e99772eb44f2.tar.xz
zfs: version bump to 0.7.11
Tested with Kernel 4.18.17.
-rw-r--r--packages/sys-fs/zfs/zfs-0.7.11.exheres-0 (renamed from packages/sys-fs/zfs/zfs-0.7.9.exheres-0)3
-rw-r--r--packages/sys-fs/zfs/zfs-scm.exheres-01
-rw-r--r--packages/sys-fs/zfs/zfs.exlib26
3 files changed, 17 insertions, 13 deletions
diff --git a/packages/sys-fs/zfs/zfs-0.7.9.exheres-0 b/packages/sys-fs/zfs/zfs-0.7.11.exheres-0
index 5211dc0..509677c 100644
--- a/packages/sys-fs/zfs/zfs-0.7.9.exheres-0
+++ b/packages/sys-fs/zfs/zfs-0.7.11.exheres-0
@@ -3,12 +3,11 @@
require zfs
-SLOT="0"
PLATFORMS="~amd64"
pkg_postinst() {
zfs_pkg_postinst
- elog "This package is compatible with linux 2.6.32 to 4.16"
+ elog "This package is compatible with linux 2.6.32 to 4.18"
}
diff --git a/packages/sys-fs/zfs/zfs-scm.exheres-0 b/packages/sys-fs/zfs/zfs-scm.exheres-0
index b6b7e09..c4924d9 100644
--- a/packages/sys-fs/zfs/zfs-scm.exheres-0
+++ b/packages/sys-fs/zfs/zfs-scm.exheres-0
@@ -3,6 +3,5 @@
require zfs
-SLOT="0"
PLATFORMS="~amd64"
diff --git a/packages/sys-fs/zfs/zfs.exlib b/packages/sys-fs/zfs/zfs.exlib
index 83c4f56..0bba2e1 100644
--- a/packages/sys-fs/zfs/zfs.exlib
+++ b/packages/sys-fs/zfs/zfs.exlib
@@ -3,8 +3,8 @@
# Copyright 2018 Rasmus Thomsen <cogitri@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 ] ]
-require systemd-service
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
+require systemd-service udev-rules
if ever is_scm; then
SCM_zfsimages_REPOSITORY="https://github.com/zfsonlinux/zfs-images.git"
@@ -16,7 +16,6 @@ require github [ user=zfsonlinux release=${PNV} suffix=tar.gz ]
export_exlib_phases src_prepare src_install pkg_postinst
-HOMEPAGE="http://zfsonlinux.org/"
SUMMARY="Native ZFS for Linux"
DESCRIPTION="
The ZFS on Linux project provides a feature-complete implementation
@@ -28,12 +27,20 @@ storage capacities, efficient data compression, integration of the concepts of
filesystem and volume management, snapshots and copy-on-write clones, continuous
integrity checking and automatic repair, RAID-Z and native NFSv4 ACLs.
"
+HOMEPAGE+=" https://zfsonlinux.org"
+
+UPSTREAM_RELEASE_NOTES="https://github.com/zfsonlinux/zfs/releases/tag/zfs-${PV}"
LICENCES="CDDL-1.0"
+SLOT="0"
MYOPTIONS=""
+# XXX: need root privileges. also, kernel modules should be build to run test
+RESTRICT="test"
+
DEPENDENCIES="
build+run:
+ net-libs/libtirpc
sys-libs/spl[~${PV}]
suggestion:
sys-boot/dracut [[ description = [ For generating initramfs which include ZFS' modules ] ]]
@@ -46,22 +53,21 @@ DEFAULT_SRC_CONFIGURE_PARAMS=(
--with-config=user
--with-dracutdir=/usr/$(exhost --target)/lib/dracut
--with-systemdmodulesloaddir=/usr/$(exhost --target)/lib/modules-load.d
- --with-udevdir=/usr/$(exhost --target)/lib/udev
+ --with-tirpc
+ --with-udevdir="${UDEVDIR}"
+ --with-udevruledir="${UDEVRULESDIR}"
--with-systemdunitdir="${SYSTEMDSYSTEMUNITDIR}"
--with-systemdpresetdir="${SYSTEMDSYSTEMUNITDIR}-preset"
--with-mounthelperdir=/usr/$(exhost --target)/bin
)
-# XXX: need root privileges. also, kernel modules should be build to run test
-RESTRICT="test"
-
AT_M4DIR=( config )
zfs_src_prepare() {
# Use prefixed cpp
- edo sed -i -e "s/cpp/$(exhost --target)-cpp/" config/kernel.m4
+ edo sed -i -e "s/cpp/$(exhost --tool-prefix)cpp/" config/kernel.m4
- eautoreconf
+ autotools_src_prepare
}
zfs_src_install() {
@@ -70,7 +76,7 @@ zfs_src_install() {
edo rmdir "${IMAGE}"/usr/$(exhost --target)/include/libzfs/linux
dodir /usr/src/${PNV}
- edo mv * "${IMAGE}/usr/src/${PNV}"
+ edo mv * "${IMAGE}"/usr/src/${PNV}
edo find "${IMAGE}" -type d -empty -delete
}