From cd06b6876b7f4fcebba9a382482ef682cbcccc86825d85d39f4bb81ca4633a32 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 21 Oct 2017 18:51:06 +0000 Subject: [PATCH 1/4] - Add patch to handle LEAP 15 API change in wait queues. This change addresses boo#1064524. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=372 --- fixes_for_leap15.patch | 13 +++++++++++++ virtualbox.changes | 5 +++++ virtualbox.spec | 5 +++++ 3 files changed, 23 insertions(+) create mode 100644 fixes_for_leap15.patch diff --git a/fixes_for_leap15.patch b/fixes_for_leap15.patch new file mode 100644 index 0000000..471fb1d --- /dev/null +++ b/fixes_for_leap15.patch @@ -0,0 +1,13 @@ +Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h +=================================================================== +--- VirtualBox-5.1.30.orig/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h ++++ VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h +@@ -46,7 +46,7 @@ + typedef struct RTR0SEMLNXWAIT + { + /** The wait queue entry. */ +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) + wait_queue_entry_t WaitQE; + #else + wait_queue_t WaitQE; diff --git a/virtualbox.changes b/virtualbox.changes index fa38300..53de2e5 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 21 18:45:20 UTC 2017 - Larry.Finger@lwfinger.net + +- Add patch to handle LEAP 15 API change in wait queues. This change addresses boo#1064524. + ------------------------------------------------------------------- Mon Oct 16 20:13:00 UTC 2017 - Larry.Finger@lwfinger.net diff --git a/virtualbox.spec b/virtualbox.spec index 62c412a..a99c99f 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -107,6 +107,8 @@ Patch116: Fix_for_server_1.19.patch Patch117: fix_KMS_support.patch # Fix invalid use of internal headers Patch118: internal-headers.patch +# Fix kernl API change in Leap 15 +Patch119: fixes_for_leap15.patch # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -387,6 +389,9 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch116 -p1 %patch117 -p1 %patch118 -p1 +%if 0%{suseversion} == 1500 +%patch119 -p1 +%endif #copy user manual cp %{SOURCE1} UserManual.pdf From 0ff2cee740c63adb659daca8628aa2099c4a4ec14a9a6f0644f3c7854d1a85f5 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 22 Oct 2017 00:14:07 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=373 --- virtualbox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtualbox.spec b/virtualbox.spec index a99c99f..7a7c260 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -389,7 +389,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch116 -p1 %patch117 -p1 %patch118 -p1 -%if 0%{suseversion} == 1500 +%if 0%{suse_version} > 1310 %patch119 -p1 %endif From 5d8d1a75e79c638a2c6ddcc92214fbe7994052b99da344d8331e681c9ef32e95 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 23 Oct 2017 15:52:25 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=375 --- virtualbox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtualbox.spec b/virtualbox.spec index 7a7c260..05e6e6a 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -389,7 +389,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch116 -p1 %patch117 -p1 %patch118 -p1 -%if 0%{suse_version} > 1310 +%if 0%{suse_version} >= 1500 %patch119 -p1 %endif From cf943cf3cac85dbf9e822a0e26e03af1448aaacd47613b22c20df93d0a80a563 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 30 Oct 2017 17:13:32 +0000 Subject: [PATCH 4/4] File "fixes_for_leap15.patch" is added to accomplish this task. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=376 --- virtualbox.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/virtualbox.changes b/virtualbox.changes index 53de2e5..7e57f4f 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -2,6 +2,7 @@ Sat Oct 21 18:45:20 UTC 2017 - Larry.Finger@lwfinger.net - Add patch to handle LEAP 15 API change in wait queues. This change addresses boo#1064524. + File "fixes_for_leap15.patch" is added to accomplish this task. ------------------------------------------------------------------- Mon Oct 16 20:13:00 UTC 2017 - Larry.Finger@lwfinger.net