Thanks for your patience! I grabbed a few minutes and tested this PR (which was tremendously helpful as I didn't have time to devote to it myself), the patch matches up to upstream stuff, everything checks out and the result builds cleanly.
Pushed.
Git Clone URL: | https://aur.archlinux.org/zfs-dkms.git (read-only, click to copy) |
---|---|
Package Base: | zfs-dkms |
Description: | Kernel modules for the Zettabyte File System. |
Upstream URL: | https://zfsonlinux.org/ |
Licenses: | CDDL |
Provides: | SPL-MODULE, zfs, ZFS-MODULE |
Submitter: | isiachi |
Maintainer: | kstolp |
Last Packager: | kstolp |
Votes: | 179 |
Popularity: | 6.41 |
First Submitted: | 2015-08-31 12:01 (UTC) |
Last Updated: | 2024-09-05 04:42 (UTC) |
« First ‹ Previous 1 .. 33 34 35 36 37 38 39 40 41 42 43 .. 63 Next › Last »
Thanks for your patience! I grabbed a few minutes and tested this PR (which was tremendously helpful as I didn't have time to devote to it myself), the patch matches up to upstream stuff, everything checks out and the result builds cleanly.
Pushed.
Eli is on vacation. In the mean time, I've created a PR with a working patch (I have in production for 5 days now). https://github.com/eli-schwartz/pkgbuilds/pull/14
@ck2katAUR: Did you look at the two .patch
files that get applied to make it compatible w/ 5.6.x?
@ck2katAUR - 5.6
support working OK in zfs-dkms 0.8.3-3
- thank you ;o)
@eschwartz I would be grateful if you could issue any news you have about making zfs-dkms compatible with the latest Arch kernel version (5.6.3.a-1-hardened in my case). Thank you
Looks like archzfs/zfs-dkms is also patching to fix it on 5.6.
There is a patch available on GitHub posted by satmandu. Here is the patch I made for this package. I tested it on linux-zen 5.6.2 and it seems alright so far.
diff --git a/.SRCINFO b/.SRCINFO
index b283878..1e00c5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
pkgver = 0.8.3
- pkgrel = 2
+ pkgrel = 3
url = https://zfsonlinux.org/
arch = any
license = CDDL
provides = ZFS-MODULE=0.8.3
@@ -14,18 +14,21 @@ pkgbase = zfs-dkms
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz.asc
source = https://github.com/openzfs/zfs/commit/2fcab8795c7c493845bfa277d44bc443802000b8.patch
source = 0001-only-build-the-module-in-dkms.conf.patch
+ source = 0001-Linux-5.6-compat.patch
validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
sha256sums = 545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd
sha256sums = SKIP
sha256sums = daae58460243c45c2c7505b1d88dcb299ea7d92bcf3f41d2d30bc213000bb1da
sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409
+ sha256sums = 7b68be97c053fc8501ef78969d0aec247de280de2119da8d7e52918ff94fd490
b2sums = 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958
b2sums = SKIP
b2sums = d221881cd4c1edc0af010343b34c941ec8bf11bf34378eef09bb5152d442f0552a527f46105ace2af76dd4b2ff4ad93d6f39fd1be3f42ccda837d0208d7f4365
b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50
+ b2sums = 653ade0e6640ffa355763137363b3e690147410aaaa66d63b75ff73558021cf33bf8eebf478aa86a903e26f7bf41a6f18a4e08f84ce95b8fa3e9db00c060fb37
pkgname = zfs-dkms
depends = zfs-utils=0.8.3
depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index e1ee480..44ae06a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
pkgname=zfs-dkms
pkgver=0.8.3
-pkgrel=2
+pkgrel=3
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
url="https://zfsonlinux.org/"
license=('CDDL')
@@ -16,17 +16,20 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms')
provides+=('zfs')
replaces=('spl-dkms')
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
"https://github.com/openzfs/zfs/commit/2fcab8795c7c493845bfa277d44bc443802000b8.patch"
- "0001-only-build-the-module-in-dkms.conf.patch")
+ "0001-only-build-the-module-in-dkms.conf.patch"
+ "0001-Linux-5.6-compat-zfs-0.8.3.patch::https://gist.githubusercontent.com/satmandu/67cbae9c4d461be0e64428a1707aef1c/raw/ba0fb65f17ccce5b710e4ce86a095de577f7dfe1/k5.6.3.patch")
sha256sums=('545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd'
'SKIP'
'daae58460243c45c2c7505b1d88dcb299ea7d92bcf3f41d2d30bc213000bb1da'
- '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409')
+ '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409'
+ '7b68be97c053fc8501ef78969d0aec247de280de2119da8d7e52918ff94fd490')
b2sums=('8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958'
'SKIP'
'd221881cd4c1edc0af010343b34c941ec8bf11bf34378eef09bb5152d442f0552a527f46105ace2af76dd4b2ff4ad93d6f39fd1be3f42ccda837d0208d7f4365'
- '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50')
+ '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50'
+ '653ade0e6640ffa355763137363b3e690147410aaaa66d63b75ff73558021cf33bf8eebf478aa86a903e26f7bf41a6f18a4e08f84ce95b8fa3e9db00c060fb37')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
prepare() {
@@ -36,8 +39,10 @@ prepare() {
patch -p1 -i ../2fcab8795c7c493845bfa277d44bc443802000b8.patch
patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
+ patch -p1 -i ../0001-Linux-5.6-compat-zfs-0.8.3.patch
+
# remove unneeded sections from module build
sed -ri "/AC_CONFIG_FILES/,/]\)/{
/AC_CONFIG_FILES/n
/]\)/n
Package linux-5.6.2 has just been released.
Unfortunately, this release again breaks build of zfs-dkms:
DKMS make.log for zfs-0.8.3 for kernel 5.6.2-arch1-2 (x86_64)
Mo 6. Apr 21:28:55 CEST 2020
make: Verzeichnis „/var/lib/dkms/zfs/0.8.3/build/module“ wird betreten
list='icp lua'; for targetdir in $list; do \
make -C $targetdir; \
done
make[1]: Verzeichnis „/var/lib/dkms/zfs/0.8.3/build/module/icp“ wird betreten
mkdir -p api core spi io os algs algs/aes algs/edonr algs/modes algs/sha1 algs/sha2 algs/skein asm-x86_64 asm-x86_64/aes asm-x86_64/modes asm-x86_64/sha1 asm-x86_64/sha2 asm-i386 asm-generic
make[1]: Verzeichnis „/var/lib/dkms/zfs/0.8.3/build/module/icp“ wird verlassen
make[1]: Verzeichnis „/var/lib/dkms/zfs/0.8.3/build/module/lua“ wird betreten
mkdir -p setjmp
make[1]: Verzeichnis „/var/lib/dkms/zfs/0.8.3/build/module/lua“ wird verlassen
make -C /usr/lib/modules/5.6.2-arch1-2/build M=`pwd` CONFIG_ZFS=m modules
make[1]: Verzeichnis „/usr/lib/modules/5.6.2-arch1-2/build“ wird betreten
CC [M] /var/lib/dkms/zfs/0.8.3/build/module/avl/avl.o
CC [M] /var/lib/dkms/zfs/0.8.3/build/module/lua/lapi.o
CC [M] /var/lib/dkms/zfs/0.8.3/build/module/nvpair/nvpair.o
CC [M] /var/lib/dkms/zfs/0.8.3/build/module/icp/illumos-crypto.o
In Datei, eingebunden von /var/lib/dkms/zfs/0.8.3/build/include/sys/nvpair.h:30,
von /var/lib/dkms/zfs/0.8.3/build/module/nvpair/nvpair.c:30:
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:88:15: Fehler: unbekannter Typname: »time_t«
88 | static inline time_t
| ^~~~~~
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h: In Funktion »gethrtime«:
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:108:18: Fehler: Speichergröße von »ts« ist unbekannt
108 | struct timespec ts;
| ^~
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:109:2: Fehler: Implizite Deklaration der Funktion »getrawmonotonic« [-Werror=implicit-function-declaration]
109 | getrawmonotonic(&ts);
| ^~~~~~~~~~~~~~~
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:108:18: Warnung: Variable »ts« wird nicht verwendet [-Wunused-variable]
108 | struct timespec ts;
| ^~
LD [M] /var/lib/dkms/zfs/0.8.3/build/module/avl/zavl.o
CC [M] /var/lib/dkms/zfs/0.8.3/build/module/icp/api/kcf_cipher.o
In Datei, eingebunden von /var/lib/dkms/zfs/0.8.3/build/include/spl/sys/condvar.h:33,
von /var/lib/dkms/zfs/0.8.3/build/include/sys/zfs_context.h:38,
von /var/lib/dkms/zfs/0.8.3/build/include/sys/lua/lua.h:13,
von /var/lib/dkms/zfs/0.8.3/build/module/lua/lapi.c:12:
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:88:15: Fehler: unbekannter Typname: »time_t«
88 | static inline time_t
| ^~~~~~
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h: In Funktion »gethrtime«:
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:108:18: Fehler: Speichergröße von »ts« ist unbekannt
108 | struct timespec ts;
| ^~
In Datei, eingebunden von /var/lib/dkms/zfs/0.8.3/build/include/spl/sys/condvar.h:33,
von /var/lib/dkms/zfs/0.8.3/build/include/sys/zfs_context.h:38,
von /var/lib/dkms/zfs/0.8.3/build/include/sys/crypto/common.h:39,
von /var/lib/dkms/zfs/0.8.3/build/module/icp/illumos-crypto.c:35:
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:88:15: Fehler: unbekannter Typname: »time_t«
88 | static inline time_t
| ^~~~~~
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h: In Funktion »gethrtime«:
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:108:18: Fehler: Speichergröße von »ts« ist unbekannt
108 | struct timespec ts;
| ^~
/var/lib/dkms/zfs/0.8.3/build/include/spl/sys/time.h:109:2: Fehler: Implizite Deklaration der Funktion »getrawmonotonic« [-Werror=implicit-function-declaration]
109 | getrawmonotonic(&ts);
...
@eschwartz:
this issue is caused by firejail
:
[@manjaro ~/build/zfs-dkms]$ ll /usr/local/bin/patch
lrwxrwxrwx 1 root root 17 Mar 28 14:56 /usr/local/bin/patch -> /usr/bin/firejail
==> Starting prepare()...
patch is /usr/local/bin/patch
patch is /usr/bin/patch
/usr/bin/patch: **** Can't open patch file ../2fcab8795c7c493845bfa277d44bc443802000b8.patch : No such file or directory
Applying patches using stdin
however still works with firejail
:
# fix compilation on kernel 5.5 https://github.com/openzfs/zfs/issues/9745
patch -p1 < ../2fcab8795c7c493845bfa277d44bc443802000b8.patch
This can also be fixed by adding $srcdir
to /etc/firejail/patch.local
whitelist /path/to/makepkg/sources
That doesn't really make much sense, and it works fine here.
Can you try modifying the PKGBUILD with this change:
prepare()() {
type -a patch
cd "${srcdir}"/${pkgname%-dkms}-${pkgver}
# rest of existing prepare goes here...
}
And tell me what the output is?
Pinned Comments
kstolp commented on 2023-09-29 00:34 (UTC)
When requesting changes, please include detailed reasoning for the change.
kstolp commented on 2023-01-07 09:31 (UTC)
If you receive this error when trying to build, it is because you have not imported the GPG keys used for verification.
You have two options:
1) Import the two keys into your keyring. ArchWiki article. You can find the key IDs in the PKGBUILD file, in the
validpgpkeys
array. (recommended)2) Alternatively, you can skip this verification by passing the
--skippgpcheck
argument tomakepkg
when building. (not recommended)