From 0ad3dd2ed3f29fb20647ef1861d7cd865e501b24dd899025575ca7493841686d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 31 Oct 2019 21:35:19 +0000 Subject: [PATCH] Accepting request 744590 from home:lwfinger:branches:Virtualization - Update "fixes_for_5.4.patch" for kernel API backport in openSUSE 15.2 OBS-URL: https://build.opensuse.org/request/show/744590 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=517 --- fixes_for_5.4.patch | 18 ++++++++++++++++-- virtualbox.changes | 5 +++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/fixes_for_5.4.patch b/fixes_for_5.4.patch index ce55291..9d61554 100644 --- a/fixes_for_5.4.patch +++ b/fixes_for_5.4.patch @@ -6,7 +6,7 @@ Index: VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux. 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) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) || OPENSUSE_152 + pSG->aSegs[iSeg].cb = pFrag->bv_len; + pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; +#else @@ -20,7 +20,7 @@ Index: VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux. 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) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) || OPENSUSE_152 + pSG->aSegs[iSeg].cb = pFrag->bv_len; + pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; +#else @@ -128,3 +128,17 @@ Index: VirtualBox-6.0.14/include/iprt/cdefs.h /** @def RT_IPRT_FORMAT_ATTR +Index: VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_drv.h +=================================================================== +--- VirtualBox-6.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h ++++ VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_drv.h +@@ -86,6 +86,9 @@ + # if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1 + # define OPENSUSE_151 + # endif ++# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2 ++# define OPENSUSE_152 ++# endif + #endif + + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) || defined(RHEL_71) diff --git a/virtualbox.changes b/virtualbox.changes index 3744d6e..b506aa7 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 31 18:55:37 UTC 2019 - Larry Finger + +- Update "fixes_for_5.4.patch" for kernel API backport in openSUSE 15.2 + ------------------------------------------------------------------- Tue Oct 22 06:44:20 UTC 2019 - Larry Finger