From 5795e0cebad4374cdcadf26355d62da80727c016 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Wed, 25 May 2022 12:52:37 +0100 Subject: Temporarily use 2.1.5 staging branch for kernel 5.18 compatiblity --- .SRCINFO | 18 ++++++++---------- 0001-only-build-the-module-in-dkms.conf.patch | 4 ++-- PKGBUILD | 22 +++++++++++----------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9027022..aec5f9e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,26 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.1.4 + pkgver = 2.1.4+65.r05147319b0 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.1.4 - provides = SPL-MODULE=2.1.4 + makedepends = git + provides = ZFS-MODULE=2.1.4+65.r05147319b0 + provides = SPL-MODULE=2.1.4+65.r05147319b0 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.4/zfs-2.1.4.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.4/zfs-2.1.4.tar.gz.asc + source = git+https://github.com/openzfs/zfs.git#commit=05147319b0821f61fcff743e20605e191d523906 source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6 sha256sums = SKIP - sha256sums = d964e11018992a2acd98e263244efdbfe4367d26ad15f4728848261d3c6e227a - b2sums = be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 + sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5 b2sums = SKIP - b2sums = 0e91cd2421b81c8ee517503059fb9ebc20e7c150801851cff2ffdfb64cbcd9a4e0657e7678c412a334fc37b589006ec78dca2ccc091b034a83a00966acba6f5b + b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791 pkgname = zfs-dkms - depends = zfs-utils=2.1.4 + depends = zfs-utils=2.1.4+65.r05147319b0 depends = dkms diff --git a/0001-only-build-the-module-in-dkms.conf.patch b/0001-only-build-the-module-in-dkms.conf.patch index c254dc1..f2c5d5f 100644 --- a/0001-only-build-the-module-in-dkms.conf.patch +++ b/0001-only-build-the-module-in-dkms.conf.patch @@ -27,10 +27,10 @@ index 88c289383..5a859a0e0 100755 --with-linux-obj="\${kernel_source_dir}" \$( [[ -n \"\${ICP_ROOT}\" ]] && \\ -@@ -69,7 +54,7 @@ POST_BUILD="scripts/dkms.postbuild +@@ -68,7 +53,7 @@ POST_BUILD="scripts/dkms.postbuild + -t \${dkms_tree} " AUTOINSTALL="yes" - REMAKE_INITRD="no" -MAKE[0]="make" +MAKE[0]="make -C module/" STRIP[0]="\$( diff --git a/PKGBUILD b/PKGBUILD index 009a29a..d729557 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.1.4 +pkgver=2.1.4+65.r05147319b0 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') -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} +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=05147319b0821f61fcff743e20605e191d523906" "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6' - 'SKIP' - 'd964e11018992a2acd98e263244efdbfe4367d26ad15f4728848261d3c6e227a') -b2sums=('be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200' - 'SKIP' - '0e91cd2421b81c8ee517503059fb9ebc20e7c150801851cff2ffdfb64cbcd9a4e0657e7678c412a334fc37b589006ec78dca2ccc091b034a83a00966acba6f5b') +sha256sums=('SKIP' + '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5') +b2sums=('SKIP' + '58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf 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 } @@ -50,7 +50,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} -- cgit v1.2.1 From 2c7091640c68b319095a6d1231d20495ddc0669b Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Wed, 25 May 2022 13:55:47 +0100 Subject: Build zfs_gitrev.h --- .SRCINFO | 2 +- PKGBUILD | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index aec5f9e..cdbcaa1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 2.1.4+65.r05147319b0 - pkgrel = 1 + pkgrel = 2 url = https://zfsonlinux.org/ arch = any license = CDDL diff --git a/PKGBUILD b/PKGBUILD index d729557..9523b7e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zfs-dkms pkgver=2.1.4+65.r05147319b0 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -45,6 +45,7 @@ build() { cd "${srcdir}"/${pkgname%-dkms} #-${pkgver} ./scripts/dkms.mkconf -n ${pkgname%-dkms} -v ${pkgver} -f dkms.conf + ./scripts/make_gitrev.sh include/zfs_gitrev.h } package() { -- cgit v1.2.1 From 24406f4f8726b23e006f7ebf75ac13f3d40a1a2a Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Thu, 16 Jun 2022 12:32:54 +0100 Subject: Update 2.1.5 staging branch for 5.18 compatibliity --- .SRCINFO | 12 ++++++------ PKGBUILD | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cdbcaa1..fa26d1d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,18 +1,18 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.1.4+65.r05147319b0 - pkgrel = 2 + pkgver = 2.1.4+88.rfc18fa92c8 + pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL makedepends = git - provides = ZFS-MODULE=2.1.4+65.r05147319b0 - provides = SPL-MODULE=2.1.4+65.r05147319b0 + provides = ZFS-MODULE=2.1.4+88.rfc18fa92c8 + provides = SPL-MODULE=2.1.4+88.rfc18fa92c8 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = git+https://github.com/openzfs/zfs.git#commit=05147319b0821f61fcff743e20605e191d523906 + source = git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5 source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B @@ -22,5 +22,5 @@ pkgbase = zfs-dkms b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791 pkgname = zfs-dkms - depends = zfs-utils=2.1.4+65.r05147319b0 + depends = zfs-utils=2.1.4+88.rfc18fa92c8 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index 9523b7e..061bb65 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.1.4+65.r05147319b0 -pkgrel=2 +pkgver=2.1.4+88.rfc18fa92c8 +pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -17,7 +17,7 @@ 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=05147319b0821f61fcff743e20605e191d523906" +source=("git+https://github.com/openzfs/zfs.git#commit=fc18fa92c8cf3bd8febed784a15804e86aa08cb5" "0001-only-build-the-module-in-dkms.conf.patch") sha256sums=('SKIP' '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5') -- cgit v1.2.1 From 56c6f7357a489ee1199463d4dddb2a4aafa91964 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Fri, 24 Jun 2022 00:28:32 +0100 Subject: Upstream 2.1.5 --- .SRCINFO | 14 ++++++++------ PKGBUILD | 18 +++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fa26d1d..89c36d6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -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 diff --git a/PKGBUILD b/PKGBUILD index 061bb65..b288f7d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -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) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf 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} -- cgit v1.2.1