summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz2020-07-19 14:19:47 -0400
committerEli Schwartz2020-07-19 14:19:47 -0400
commitf7639797b57930f9a9a1c1e63cdce7c5a1ec8a0a (patch)
tree153f3734e034e5508ca2564bbe4e72719ee88064
parent58e65d33112c5cea9cc63a60eeecbfc234672106 (diff)
downloadaur-f7639797b57930f9a9a1c1e63cdce7c5a1ec8a0a.tar.gz
upgpkg: zfs-dkms-git 1:0.8.0.r932.g317dbea17-1
Adapt to upstream change that moved gitrev generation to build time instead of dist time. The build then failed because the old script didn't exist. Manually reimplement it by hand for now...
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD7
2 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d3beeb0dc4fd..54cc5bb4dbc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = zfs-dkms-git
pkgdesc = Kernel modules for the Zettabyte File System.
- pkgver = 0.8.0.r858.g1c08fa8b5
- pkgrel = 2
+ pkgver = 0.8.0.r932.g317dbea17
+ pkgrel = 1
epoch = 1
url = https://zfsonlinux.org/
arch = any
license = CDDL
makedepends = git
- provides = ZFS-MODULE=0.8.0.r858.g1c08fa8b5
- provides = SPL-MODULE=0.8.0.r858.g1c08fa8b5
- provides = zfs-dkms=0.8.0.r858.g1c08fa8b5
+ provides = ZFS-MODULE=0.8.0.r932.g317dbea17
+ provides = SPL-MODULE=0.8.0.r932.g317dbea17
+ provides = zfs-dkms=0.8.0.r932.g317dbea17
provides = spl-dkms
provides = zfs
conflicts = zfs-dkms
@@ -23,6 +23,5 @@ pkgbase = zfs-dkms-git
b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50
pkgname = zfs-dkms-git
- depends = zfs-utils-git=1:0.8.0.r858.g1c08fa8b5
+ depends = zfs-utils-git=1:0.8.0.r932.g317dbea17
depends = dkms
-
diff --git a/PKGBUILD b/PKGBUILD
index c76fe9c8f26e..91a7d8a62ff5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
pkgname=zfs-dkms-git
-pkgver=0.8.0.r858.g1c08fa8b5
-pkgrel=2
+pkgver=0.8.0.r932.g317dbea17
+pkgrel=1
epoch=1
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
@@ -50,7 +50,8 @@ build() {
./scripts/dkms.mkconf -n zfs -v ${pkgver} -f dkms.conf
# update metadata
- ./scripts/make_gitrev.sh
+ printf '#define\tZFS_META_GITREV "%s"\n' "$(git describe --always --long --dirty)" \
+ > include/zfs_gitrev.h
_meta_release=${pkgver#*.r}
sed -i -e "s/Release:[[:print:]]*/Release: ${_meta_release/./_}/" META
}