diff options
author | Jonathon Fernyhough <jonathon@m2x.dev> | 2022-06-24 00:28:32 +0100 |
---|---|---|
committer | Jonathon Fernyhough <jonathon@m2x.dev> | 2022-06-24 00:28:32 +0100 |
commit | 56c6f7357a489ee1199463d4dddb2a4aafa91964 (patch) | |
tree | 57074a600043f32ae357acae6b1a3b4740f539bf | |
parent | Update 2.1.5 staging branch for 5.18 compatibliity (diff) | |
download | zfs-dkms-56c6f7357a489ee1199463d4dddb2a4aafa91964.tar.xz |
Upstream 2.1.5
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 18 |
2 files changed, 17 insertions, 15 deletions
@@ -1,26 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.1.4+88.rfc18fa92c8 + pkgver = 2.1.5 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - makedepends = git - provides = ZFS-MODULE=2.1.4+88.rfc18fa92c8 - provides = SPL-MODULE=2.1.4+88.rfc18fa92c8 + provides = ZFS-MODULE=2.1.5 + provides = SPL-MODULE=2.1.5 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5 + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B + sha256sums = 1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c sha256sums = SKIP sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5 + b2sums = c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49 b2sums = SKIP b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791 pkgname = zfs-dkms - depends = zfs-utils=2.1.4+88.rfc18fa92c8 + depends = zfs-utils=2.1.5 depends = dkms @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.1.4+88.rfc18fa92c8 +pkgver=2.1.5 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -15,19 +15,19 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms') # ambiguous, provided for backwards compat, pls don't use provides+=('zfs') replaces=('spl-dkms') -makedepends=('git') -#source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} -source=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5" +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('SKIP' +sha256sums=('1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c' + 'SKIP' '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5') -b2sums=('SKIP' +b2sums=('c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49' + 'SKIP' '58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov> 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov> prepare() { - cd "${srcdir}"/${pkgname%-dkms} #-${pkgver} + cd "${srcdir}"/${pkgname%-dkms}-${pkgver} patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch @@ -42,7 +42,7 @@ prepare() { } build() { - cd "${srcdir}"/${pkgname%-dkms} #-${pkgver} + cd "${srcdir}"/${pkgname%-dkms}-${pkgver} ./scripts/dkms.mkconf -n ${pkgname%-dkms} -v ${pkgver} -f dkms.conf ./scripts/make_gitrev.sh include/zfs_gitrev.h @@ -51,7 +51,7 @@ build() { package() { depends=("zfs-utils=${pkgver}" 'dkms') - cd "${srcdir}"/${pkgname%-dkms} #-${pkgver} + cd "${srcdir}"/${pkgname%-dkms}-${pkgver} dkmsdir="${pkgdir}/usr/src/${pkgname%-dkms}-${pkgver}" install -d "${dkmsdir}"/{config,scripts} |