mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 09:37:59 +03:00
Merge pull request #243016 from chayleaf/kvmfr-linux64
This commit is contained in:
commit
0b4db90430
@ -1,11 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }:
|
||||
{ lib, stdenv, kernel, looking-glass-client }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "kvmfr";
|
||||
version = looking-glass-client.version;
|
||||
|
||||
src = looking-glass-client.src;
|
||||
sourceRoot = "source/module";
|
||||
patches = lib.optional (kernel.kernelAtLeast "6.4") [
|
||||
./linux-6-4-compat.patch
|
||||
];
|
||||
hardeningDisable = [ "pic" "format" ];
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
|
16
pkgs/os-specific/linux/kvmfr/linux-6-4-compat.patch
Normal file
16
pkgs/os-specific/linux/kvmfr/linux-6-4-compat.patch
Normal file
@ -0,0 +1,16 @@
|
||||
diff --git a/kvmfr.c b/kvmfr.c
|
||||
index 121aae5b..2f4c9e1a 100644
|
||||
--- a/kvmfr.c
|
||||
+++ b/kvmfr.c
|
||||
@@ -539,7 +539,11 @@ static int __init kvmfr_module_init(void)
|
||||
if (kvmfr->major < 0)
|
||||
goto out_free;
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
|
||||
kvmfr->pClass = class_create(THIS_MODULE, KVMFR_DEV_NAME);
|
||||
+#else
|
||||
+ kvmfr->pClass = class_create(KVMFR_DEV_NAME);
|
||||
+#endif
|
||||
if (IS_ERR(kvmfr->pClass))
|
||||
goto out_unreg;
|
||||
|
Loading…
Reference in New Issue
Block a user