From f88f295bdf3cbe35b83e0db504f4764494e20ee3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 5 Oct 2022 15:11:22 +0200 Subject: [PATCH] prl-tools: add patch against 6.0 --- pkgs/os-specific/linux/prl-tools/default.nix | 4 ++++ .../os-specific/linux/prl-tools/prl-tools-6.0.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 95e6850f8940..a4b312791457 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-igIRWLKbgU8pQrsK+lyjP8aodylXjRrRlOlaP5KbHm8="; }; + patches = lib.optionals (lib.versionAtLeast kernel.version "6.0") [ + ./prl-tools-6.0.patch + ]; + hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ] diff --git a/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch b/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch new file mode 100644 index 000000000000..f0bd00d24e0b --- /dev/null +++ b/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch @@ -0,0 +1,13 @@ +diff --git a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c +index baa8a19..6788791 100644 +--- a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c ++++ b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c +@@ -306,7 +306,7 @@ int seq_show(struct seq_file *file, void *data) + char buf[BDEVNAME_SIZE]; + + fsb = list_entry((struct list_head*)data, struct frozen_sb, list); +- bdevname(fsb->sb->s_bdev, buf); ++ snprintf(buf, sizeof(buf), "%pg", fsb->sb->s_bdev); + seq_printf(file, "%s\n", buf); + return 0; + }