forked from pool/virtualbox
Accepting request 732783 from home:lwfinger:branches:Virtualization
- Add BuildRequires for device-mapper - Add file "fixes_for_5.4.patch" to handle API changes in kernel 5.4 OBS-URL: https://build.opensuse.org/request/show/732783 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=505
This commit is contained in:
Larry Finger
Git OBS Bridge
parent
a7e58ef2cc
commit
23dfa4f254
72
fixes_for_5.4.patch
Normal file
72
fixes_for_5.4.patch
Normal file
@ -0,0 +1,72 @@
|
||||
Index: VirtualBox-6.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
===================================================================
|
||||
--- VirtualBox-6.0.12.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
+++ VirtualBox-6.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
||||
@@ -924,8 +924,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB
|
||||
for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)
|
||||
{
|
||||
skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
|
||||
+ pSG->aSegs[iSeg].cb = pFrag->bv_len;
|
||||
+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
|
||||
+#else
|
||||
pSG->aSegs[iSeg].cb = pFrag->size;
|
||||
pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset;
|
||||
+#endif
|
||||
Log6((" %p", pSG->aSegs[iSeg].pv));
|
||||
pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS;
|
||||
Assert(iSeg <= pSG->cSegsAlloc);
|
||||
@@ -940,8 +945,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB
|
||||
for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++)
|
||||
{
|
||||
skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
|
||||
+ pSG->aSegs[iSeg].cb = pFrag->bv_len;
|
||||
+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
|
||||
+#else
|
||||
pSG->aSegs[iSeg].cb = pFrag->size;
|
||||
pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset;
|
||||
+#endif
|
||||
Log6((" %p", pSG->aSegs[iSeg].pv));
|
||||
pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS;
|
||||
Assert(iSeg <= pSG->cSegsAlloc);
|
||||
Index: VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
===================================================================
|
||||
--- VirtualBox-6.0.12.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
+++ VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||
@@ -444,8 +444,10 @@ RTR0DECL(void *) RTMemContAlloc(PRTCCPHY
|
||||
|
||||
SetPageReserved(&paPages[iPage]);
|
||||
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
|
||||
MY_SET_PAGES_EXEC(&paPages[iPage], 1);
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
*pPhys = page_to_phys(paPages);
|
||||
pvRet = phys_to_virt(page_to_phys(paPages));
|
||||
@@ -492,8 +494,10 @@ RTR0DECL(void) RTMemContFree(void *pv, s
|
||||
{
|
||||
ClearPageReserved(&paPages[iPage]);
|
||||
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
|
||||
MY_SET_PAGES_NOEXEC(&paPages[iPage], 1);
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
__free_pages(paPages, cOrder);
|
||||
IPRT_LINUX_RESTORE_EFL_AC();
|
||||
Index: VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
|
||||
===================================================================
|
||||
--- VirtualBox-6.0.12.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
|
||||
+++ VirtualBox-6.0.12/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
|
||||
@@ -36,6 +36,9 @@
|
||||
#include <iprt/errcore.h>
|
||||
#include "internal/thread.h"
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
|
||||
+#include <uapi/linux/sched/types.h>
|
||||
+#endif
|
||||
|
||||
RTDECL(RTTHREAD) RTThreadSelf(void)
|
||||
{
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 23 17:17:18 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Add BuildRequires for device-mapper
|
||||
|
||||
- Add file "fixes_for_5.4.patch" to handle API changes in kernel 5.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 7 21:28:46 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
|
||||
@ -147,6 +147,8 @@ Patch131: fixes_for_5.3.patch
|
||||
# Fixes for Qt5.13 on 32-bit systems
|
||||
Patch132: fixes_for_qt5.13.patch
|
||||
#endif
|
||||
# Fixes for API changes in kernel 5.4
|
||||
Patch133: fixes_for_5.4.patch
|
||||
Patch999: virtualbox-fix-ui-background-color.patch
|
||||
#
|
||||
BuildRequires: LibVNCServer-devel
|
||||
@ -163,6 +165,7 @@ BuildRequires: boost-devel
|
||||
%endif
|
||||
BuildRequires: %{kernel_module_package_buildreqs}
|
||||
BuildRequires: dev86
|
||||
BuildRequires: device-mapper
|
||||
BuildRequires: device-mapper-devel
|
||||
BuildRequires: dmidecode
|
||||
BuildRequires: e2fsprogs-devel
|
||||
@ -449,6 +452,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
|
||||
%ifarch %ix86 && 0%{?qt5ver} >= 51300
|
||||
%patch132 -p1
|
||||
%endif
|
||||
%patch133 -p1
|
||||
|
||||
# make VB UI background colors look sane again
|
||||
%patch999 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user