diff --git a/fixes_for_5.14.patch b/fixes_for_5.14.patch new file mode 100644 index 0000000..d39e5cf --- /dev/null +++ b/fixes_for_5.14.patch @@ -0,0 +1,50 @@ +Index: VirtualBox-6.1.22/src/VBox/Additions/linux/sharedfolders/regops.c +=================================================================== +--- VirtualBox-6.1.22.orig/src/VBox/Additions/linux/sharedfolders/regops.c ++++ VirtualBox-6.1.22/src/VBox/Additions/linux/sharedfolders/regops.c +@@ -2126,7 +2126,11 @@ static int vbsf_iter_lock_pages(struct i + int rc = 0; + + Assert(iov_iter_count(iter) + pStash->cb > 0); ++#if RTLNX_VER_MAX(5, 14,0) + if (!(iter->type & ITER_KVEC)) { ++#else ++ if (iov_iter_type(iter) != ITER_KVEC) { ++#endif + /* + * Do we have a stashed page? + */ +@@ -2373,7 +2377,11 @@ static size_t vbsf_iter_max_span_of_page + { + size_t cPages; + # if RTLNX_VER_MIN(3,16,0) ++# if RTLNX_VER_MAX(5, 14, 0) + if (iter_is_iovec(iter) || (iter->type & ITER_KVEC)) { ++#else ++ if (iter_is_iovec(iter) || (iter_is_iovec(iter) == ITER_KVEC)) { ++#endif + #endif + const struct iovec *pCurIov = iter->iov; + size_t cLeft = iter->nr_segs; +@@ -2436,7 +2444,11 @@ static size_t vbsf_iter_max_span_of_page + } else { + /* Won't bother with accurate counts for the next two types, just make + some rough estimates (does pipes have segments?): */ ++#if RTLNX_VER_MAX(5, 14,0) + size_t cSegs = iter->type & ITER_BVEC ? RT_MAX(1, iter->nr_segs) : 1; ++#else ++ size_t cSegs = (iov_iter_type(iter) == ITER_BVEC) ? RT_MAX(1, iter->nr_segs) : 1; ++#endif + cPages = (iov_iter_count(iter) + (PAGE_SIZE * 2 - 2) * cSegs) >> PAGE_SHIFT; + } + # endif +@@ -3793,7 +3805,9 @@ struct address_space_operations vbsf_reg + #endif + #if RTLNX_VER_MIN(2,6,24) + .write_begin = vbsf_write_begin, ++#if RTLNX_VER_MAX(5, 14, 0) + .write_end = simple_write_end, ++#endif + #elif RTLNX_VER_MIN(2,5,45) + .prepare_write = simple_prepare_write, + .commit_write = simple_commit_write, diff --git a/virtualbox.changes b/virtualbox.changes index ddb5b50..e9f07bd 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 14 04:03:16 UTC 2021 - Larry Finger + +- Add file "fixes_for_5.14.patch" to fix builds on kernel 5.14. + ------------------------------------------------------------------- Mon May 17 15:59:52 UTC 2021 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 98fddd1..24d55e8 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -1,5 +1,5 @@ # -# spec file for package virtualbox%{?dash}%{?name_suffix} +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -186,8 +186,8 @@ Patch137: handle_gsoap_208103.patch # Fix for struct file_operations backport in 15.3 Patch139: fixes_for_leap15.3.patch Patch141: vb-6.1.16-modal-dialog-parent.patch -# Fixes for kernel 5.13 -# Patch142: fixes_for_5.13.patch +# Fixes for kernel 5.14 +Patch142: fixes_for_5.14.patch Patch999: virtualbox-fix-ui-background-color.patch # @@ -330,6 +330,12 @@ the terms of the GNU Public License (GPL). + + + + + + @@ -373,6 +379,12 @@ This package contains the code for the GUI used to control VMs. + + + + + + @@ -410,6 +422,12 @@ The VirtualBox web server is used to control headless VMs using a browser. + + + + + + @@ -449,6 +467,12 @@ This package contains X11 guest utilities and X11 guest mouse and video drivers + + + + + + @@ -493,6 +517,12 @@ VirtualBox guest addition tools. + + + + + + @@ -537,6 +567,12 @@ Python XPCOM bindings to %{name}. Used e.g. by vboxgtk package. + + + + + + @@ -576,6 +612,12 @@ Development file for %{name} + + + + + + @@ -624,6 +666,12 @@ sudo /sbin/vboxguestconfig + + + + + + ########################################### %package guest-desktop-icons @@ -654,6 +702,12 @@ This package contains icons for guest desktop files that were created on the des + + + + + + @@ -734,7 +788,7 @@ This package contains the kernel-modules that VirtualBox uses to create or run v %patch139 -p1 %endif %patch141 -p1 -#%patch142 -p1 +%patch142 -p1 # make VB UI background colors look sane again %patch999 -p1