From 24f3ab2b19a81b582f15aa317e5966cf56df2c67 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Mon, 8 Mar 2021 11:12:55 +0300 Subject: linux-zfs: new-package, zfs: update to 2.0.3 --- personal/zfs/build | 26 +++++++------------------- personal/zfs/checksums | 2 +- personal/zfs/message | 10 +++++++--- personal/zfs/post-install | 2 -- personal/zfs/sources | 2 +- personal/zfs/version | 2 +- 6 files changed, 17 insertions(+), 27 deletions(-) delete mode 100755 personal/zfs/post-install (limited to 'personal/zfs') diff --git a/personal/zfs/build b/personal/zfs/build index 52cf826..49955e5 100755 --- a/personal/zfs/build +++ b/personal/zfs/build @@ -1,33 +1,21 @@ #!/bin/sh -e -# Build script originally taken from github.com/jedavies-dev/kiss-zfs -# Patched to work with the latest kernel, better directory management etc. - -sed -i 's/CDDL/GPL/g' META ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --sbindir=/usr/bin \ + --with-mounthelperdir=/usr/bin \ + --with-udevdir=/usr/lib/udev \ + --with-udevruledir=/usr/lib/udev/rules.d \ + --with-config=user \ --disable-systemd \ --disable-sysvinit \ - --disable-nls \ - --enable-linux-builtin \ - --with-linux="/usr/lib/modules/${KERNEL_VERSION:-$(uname -r)}/build" + --disable-nls -make +make CCLD="${CC:-cc} -all-static" make DESTDIR="$1" install -cd module -make -make DESTDIR="$1/usr" install - -# Holy hell zfs is insistent on not installing files where I want them to be -# installed. -mv "$1/lib/udev" "$1/usr/lib" -mv "$1/sbin/mount.zfs" "$1/usr/bin/mount.zfs" -rm -r "$1/sbin" "$1/lib" - +# Remove unrequired files rm -rf "$1/usr/share/zfs/zfs-tests" \ "$1/usr/lib/dracut" \ "$1/usr/share/initramfs-tools" - diff --git a/personal/zfs/checksums b/personal/zfs/checksums index fde7e2a..5487daf 100644 --- a/personal/zfs/checksums +++ b/personal/zfs/checksums @@ -1 +1 @@ -dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d zfs-0.8.5.tar.gz +0694f64aa76a3a0a506e20e99b49102c3cb68bef63cb0f0154e50befc387e539 zfs-2.0.3.tar.gz diff --git a/personal/zfs/message b/personal/zfs/message index 193f7b3..b49fa50 100644 --- a/personal/zfs/message +++ b/personal/zfs/message @@ -1,6 +1,10 @@ IMPORTANT - You will need to rebuild this package for everytime you upgrade the kernel. - You can specify a KERNEL_VERSION variable in order to build without the need - to reboot before building. +This package DOES NOT install the zfs kernel module, it only installs the zfs +tools. I use a monolithic kernel, so I build the zfs module inside the kernel. +See the linux-zfs package if you want to see how I do that or fork that package. +This package used to build the modules, but I didn't like the fact that the only +reason I used a non-monolithic kernel was to use zfs. If you are interested in +the modular do a git checkout of an older version of this package and fork that +package. diff --git a/personal/zfs/post-install b/personal/zfs/post-install deleted file mode 100755 index 6997bf4..0000000 --- a/personal/zfs/post-install +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -depmod -b "$CPT_ROOT/usr" "${KERNEL_VERSION:-$(uname -r)}" diff --git a/personal/zfs/sources b/personal/zfs/sources index c1eaf11..367b86b 100644 --- a/personal/zfs/sources +++ b/personal/zfs/sources @@ -1 +1 @@ -https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz +https://github.com/openzfs/zfs/releases/download/zfs-2.0.3/zfs-2.0.3.tar.gz diff --git a/personal/zfs/version b/personal/zfs/version index 9943d15..c103c3e 100644 --- a/personal/zfs/version +++ b/personal/zfs/version @@ -1 +1 @@ -0.8.5 1 +2.0.3 1 -- cgit v1.2.3