diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | 0001-only-build-the-module-in-dkms.conf.patch | 36 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
3 files changed, 30 insertions, 37 deletions
@@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.1.1 + pkgver = 2.1.5 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.1.1 - provides = SPL-MODULE=2.1.1 + provides = ZFS-MODULE=2.1.5 + provides = SPL-MODULE=2.1.5 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz.asc + 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 = bd4f48d009f3b5e291390bde62b0131b8bf3fab09f4fc0fa3591b1f2e7074cff + sha256sums = 1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c sha256sums = SKIP - sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 + sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5 + b2sums = c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49 b2sums = SKIP - b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 + b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791 pkgname = zfs-dkms - depends = zfs-utils=2.1.1 + depends = zfs-utils=2.1.5 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 0e162b5db1f..f2c5d5f9dce 100644 --- a/0001-only-build-the-module-in-dkms.conf.patch +++ b/0001-only-build-the-module-in-dkms.conf.patch @@ -11,34 +11,26 @@ diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf index 88c289383..5a859a0e0 100755 --- a/scripts/dkms.mkconf +++ b/scripts/dkms.mkconf -@@ -25,22 +25,7 @@ PACKAGE_CONFIG="${pkgcfg}" +@@ -28,14 +28,7 @@ PACKAGE_CONFIG="${pkgcfg}" PRE_BUILD="configure --prefix=/usr --with-config=kernel - --with-linux=\$( -- case \`lsb_release -is\` in -- (Debian|Devuan) -- if [[ -e \${kernel_source_dir/%build/source} ]] -- then -- echo \${kernel_source_dir/%build/source} -- else -- # A kpkg exception for Proxmox 2.0 -- echo \${kernel_source_dir} -- fi -- ;; -- (*) -- echo \${kernel_source_dir} -- ;; -- esac +- if [ -e "\${kernel_source_dir/%build/source}" ] +- then +- echo "\${kernel_source_dir/%build/source}" +- else +- echo "\${kernel_source_dir}" +- fi - ) -+ --with-linux=\${kernel_source_dir} - --with-linux-obj=\${kernel_source_dir} - --with-spl=\${source_tree}/spl-\${PACKAGE_VERSION} - --with-spl-obj=\${dkms_tree}/spl/\${PACKAGE_VERSION}/\${kernelver}/\${arch} -@@ -78,7 +63,7 @@ POST_BUILD="scripts/dkms.postbuild - BUILD_DEPENDS[0]="spl" ++ --with-linux="\${kernel_source_dir}" + --with-linux-obj="\${kernel_source_dir}" + \$( + [[ -n \"\${ICP_ROOT}\" ]] && \\ +@@ -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]="\$( @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.1.1 +pkgver=2.1.5 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,12 +17,12 @@ provides+=('zfs') replaces=('spl-dkms') 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=('bd4f48d009f3b5e291390bde62b0131b8bf3fab09f4fc0fa3591b1f2e7074cff' +sha256sums=('1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c' 'SKIP' - '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800' + '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5') +b2sums=('c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49' 'SKIP' - '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') + '58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov> 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov> @@ -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() { |