summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO20
-rw-r--r--.gitignore3
-rw-r--r--PKGBUILD22
3 files changed, 21 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7d509b2d50b..6651be56bdf9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
pkgbase = zfs-linux-lts-rc
- pkgver = 0.8.0_rc5_4.19.44.1
+ pkgver = 2.1.0_rc8_5.10.47.1
pkgrel = 1
- url = http://zfsonlinux.org/
+ url = https://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-lts-headers=4.19.44-1
- makedepends = python
+ makedepends = linux-lts-headers=5.10.47-1
depends = kmod
- depends = zfs-utils-rc=0.8.0_rc5
- depends = linux-lts=4.19.44-1
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.0-rc5/zfs-0.8.0-rc5.tar.gz
- sha256sums = c5dc91e3efb7555c6c1846cf89fd4cfb0952271a2900434e697f2b7397ce9b16
+ depends = zfs-utils-rc=2.1.0_rc8
+ depends = linux-lts=5.10.47-1
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.0-rc8/zfs-2.1.0-rc8.tar.gz
+ sha256sums = 8627702ac841d38d5211001c76937e4097719c268b110e8836c0da195618fad2
pkgname = zfs-linux-lts-rc
pkgdesc = Kernel modules for the Zettabyte File System.
@@ -21,11 +20,11 @@ pkgname = zfs-linux-lts-rc
conflicts = zfs-dkms
conflicts = zfs-dkms-git
conflicts = zfs-dkms-rc
+ conflicts = spl-dkms
+ conflicts = spl-dkms-git
conflicts = zfs-linux-lts
conflicts = zfs-linux-lts-git
conflicts = spl-linux-lts
- conflicts = spl-dkms
- conflicts = spl-dkms-git
pkgname = zfs-linux-lts-rc-headers
pkgdesc = Kernel headers for the Zettabyte File System.
@@ -38,4 +37,3 @@ pkgname = zfs-linux-lts-rc-headers
conflicts = spl-dkms
conflicts = spl-dkms-git
conflicts = spl-headers
-
diff --git a/.gitignore b/.gitignore
index 206ea9392201..33c98cc0fdd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.tar.xz
*.tar.gz
+*.tar.zst
*.sig
-*.log \ No newline at end of file
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index c856570c5eb0..aec2bdcc6366 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,17 +17,17 @@
#
pkgbase="zfs-linux-lts-rc"
pkgname=("zfs-linux-lts-rc" "zfs-linux-lts-rc-headers")
-_zfsver="0.8.0_rc5"
-_kernelver="4.19.44-1"
-_extramodules="4.19.44-1-lts"
+_zfsver="2.1.0_rc8"
+_kernelver="5.10.47-1"
+_extramodules="5.10.47-1-lts"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
pkgrel=1
-makedepends=("linux-lts-headers=${_kernelver}" "python")
+makedepends=("linux-lts-headers=${_kernelver}")
arch=("x86_64")
-url="http://zfsonlinux.org/"
+url="https://zfsonlinux.org/"
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver/_/-}/zfs-${_zfsver/_/-}.tar.gz")
-sha256sums=("c5dc91e3efb7555c6c1846cf89fd4cfb0952271a2900434e697f2b7397ce9b16")
+sha256sums=("8627702ac841d38d5211001c76937e4097719c268b110e8836c0da195618fad2")
license=("CDDL")
depends=("kmod" "zfs-utils-rc=${_zfsver}" "linux-lts=${_kernelver}")
@@ -35,8 +35,8 @@ build() {
cd "${srcdir}/zfs-${_zfsver/_rc*/}"
./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \
- --datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \
- --libexecdir=/usr/lib/zfs-${zfsver} --with-config=kernel \
+ --datadir=/usr/share --includedir=/usr/include --with-udevdir=/usr/lib/udev \
+ --libexecdir=/usr/lib --with-config=kernel \
--with-linux=/usr/lib/modules/${_extramodules}/build \
--with-linux-obj=/usr/lib/modules/${_extramodules}/build
make
@@ -47,11 +47,9 @@ package_zfs-linux-lts-rc() {
install=zfs.install
provides=("zfs" "spl")
groups=("archzfs-linux-lts-rc")
- conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-lts' 'zfs-linux-lts-git' 'spl-linux-lts' "spl-dkms" "spl-dkms-git")
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" 'zfs-linux-lts' 'zfs-linux-lts-git' 'spl-linux-lts')
cd "${srcdir}/zfs-${_zfsver/_rc*/}"
- make DESTDIR="${pkgdir}" install
- cp -r "${pkgdir}"/{lib,usr}
- rm -r "${pkgdir}"/lib
+ make DESTDIR="${pkgdir}" INSTALL_MOD_PATH=/usr install
# Remove src dir
rm -r "${pkgdir}"/usr/src
}