diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2023-05-23 20:03:08 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-05-30 03:50:53 +0100 |
| commit | 7b66ebce8f979c5dfc190070c22745b7aa375cc3 (patch) | |
| tree | 200166fd1f10fa9e068b27ddff82c0565733e945 /sys-fs/zfs-kmod/files | |
| parent | linux-mod-r1.eclass: mention dist-kernel for upper bounds (diff) | |
| download | gentoo-7b66ebce8f979c5dfc190070c22745b7aa375cc3.tar.gz gentoo-7b66ebce8f979c5dfc190070c22745b7aa375cc3.tar.bz2 gentoo-7b66ebce8f979c5dfc190070c22745b7aa375cc3.zip | |
sys-fs/zfs-kmod: migrate to linux-mod-r1
(sam: Taking ionen's PoC conversion and committing it after testing.)
Closes: https://bugs.gentoo.org/814194
Closes: https://bugs.gentoo.org/865157
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-fs/zfs-kmod/files')
| -rw-r--r-- | sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch new file mode 100644 index 000000000000..53c5f27b3bed --- /dev/null +++ b/sys-fs/zfs-kmod/files/zfs-kmod-2.1.11-gentoo.patch @@ -0,0 +1,24 @@ +Hack to pass the full linux-mod-r1 toolchain to make during ./configure. +Not needed at build time given can pass it normally then. + +Eclass has workarounds, compiler/version matching, and its own set of +user variables which creates disparity between ebuilds if not used. + +For the (normal) alternative: KERNEL_{CC,LD} alone is insufficient, +but combining with KERNEL_LLVM=1 when CC_IS_CLANG will allow it +to work for *most* people (will likely still need KERNEL_LD from +linux-mod-r1, or ThinLTO kernels may fail with sandbox violations). + +Note KERNEL_* also cause failure if they contain spaces. + +https://bugs.gentoo.org/865157 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -646,6 +646,5 @@ + AC_TRY_COMMAND([ + KBUILD_MODPOST_NOFINAL="$5" KBUILD_MODPOST_WARN="$6" +- make modules -k -j$TEST_JOBS ${KERNEL_CC:+CC=$KERNEL_CC} +- ${KERNEL_LD:+LD=$KERNEL_LD} ${KERNEL_LLVM:+LLVM=$KERNEL_LLVM} ++ make modules -k -j$TEST_JOBS '${GENTOO_MAKEARGS_EVAL}' + CONFIG_MODULES=y CFLAGS_MODULE=-DCONFIG_MODULES + -C $LINUX_OBJ $ARCH_UM M=$PWD/$1 >$1/build.log 2>&1]) |