From 0ad3dd2ed3f29fb20647ef1861d7cd865e501b24dd899025575ca7493841686d Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 31 Oct 2019 21:35:19 +0000 Subject: [PATCH 1/4] 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 From 9ce46fa4ce9e8d69727b41a98e0e5d238c2566bb9c5620351b384c4d369f5d4c Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 31 Oct 2019 23:57:57 +0000 Subject: [PATCH 2/4] Accepting request 744598 from home:lwfinger:branches:Virtualization Further changes to fixes_for_5.2.patch OBS-URL: https://build.opensuse.org/request/show/744598 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=518 --- fixes_for_5.4.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fixes_for_5.4.patch b/fixes_for_5.4.patch index 9d61554..02dd4bd 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) || OPENSUSE_152 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) || defined(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) || OPENSUSE_152 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) || defined(OPENSUSE_152) + pSG->aSegs[iSeg].cb = pFrag->bv_len; + pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; +#else From 3ddd312ff171528f2b04191dbd6431b4deda50988ad372a58ebb3528434c57c9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 2 Nov 2019 14:40:38 +0000 Subject: [PATCH 3/4] Accepting request 744895 from home:lwfinger:branches:Virtualization - Fix build errors in Leap 42.3 OBS-URL: https://build.opensuse.org/request/show/744895 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=519 --- fixes_for_5.4.patch | 29 +++++++++++++---------------- virtualbox.changes | 5 +++++ virtualbox.spec | 9 +++++++++ 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/fixes_for_5.4.patch b/fixes_for_5.4.patch index 02dd4bd..541226a 100644 --- a/fixes_for_5.4.patch +++ b/fixes_for_5.4.patch @@ -2,7 +2,18 @@ Index: VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux. =================================================================== --- VirtualBox-6.0.14.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -@@ -924,8 +924,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB +@@ -73,6 +73,10 @@ + #define VBOXNETFLT_OS_SPECFIC 1 + #include "../VBoxNetFltInternal.h" + ++# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2 ++# define OPENSUSE_152 ++# endif ++ + typedef struct VBOXNETFLTNOTIFIER { + struct notifier_block Notifier; + PVBOXNETFLTINS pThis; +@@ -924,8 +928,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++) { skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i]; @@ -16,7 +27,7 @@ Index: VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux. Log6((" %p", pSG->aSegs[iSeg].pv)); pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS; Assert(iSeg <= pSG->cSegsAlloc); -@@ -940,8 +945,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB +@@ -940,8 +949,13 @@ static void vboxNetFltLinuxSkBufToSG(PVB for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++) { skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i]; @@ -128,17 +139,3 @@ 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 b506aa7..093797c 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 2 00:58:22 UTC 2019 - Larry Finger + +- Fix build errors in Leap 42.3 + ------------------------------------------------------------------- Thu Oct 31 18:55:37 UTC 2019 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index cc337c1..306dea1 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -60,7 +60,9 @@ Url: http://www.virtualbox.org/ #%%(bash %%{_sourcedir}/virtualbox-patch-source.sh VirtualBox-%%{version}.tar.bz2) Source0: VirtualBox-%{version}-patched.tar.bz2 Source1: UserManual.pdf +%if 0%{?sle_version} != 120300 Source2: VirtualBox.appdata.xml +%endif Source3: %{name}-60-vboxguest.rules Source4: %{name}-default.virtualbox Source5: %{name}-kmp-files @@ -444,6 +446,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch123 -p1 %patch125 -p1 %patch128 -p1 +echo "sle_version " %{?sle_version}", is_opensuse " %{?is_opensuse}", suse_version " %{?suse_version} # Adjustments that are version dependent %if 0%{?sle_version} == 120300 && 0%{?is_opensuse} # Patch for Leap 42.3 @@ -589,7 +592,9 @@ install -d -m 755 %{buildroot}%{_bindir} install -d -m 755 %{buildroot}%{_sbindir} install -d -m 755 %{buildroot}%{_datadir}/virtualbox/nls install -d -m 755 %{buildroot}%{_datadir}/pixmaps +%if 0%{?sle_version} != 120300 install -d -m 755 %{buildroot}%{_datadir}/metainfo +%endif install -d -m 755 %{buildroot}%{_datadir}/applications install -d -m 755 %{buildroot}%{_vbox_instdir}/sdk/bindings/xpcom install -d -m 755 %{buildroot}%{_vbox_instdir}/components @@ -711,9 +716,11 @@ popd install -m 644 out/linux.*/release/bin/virtualbox.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop 'System Emulator' +%if 0%{?sle_version} != 120300 # install appstream file mkdir -p %{buildroot}%{_datadir}/metainfo install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml +%endif # create a menu entry mkdir -p %{buildroot}%{_datadir}/pixmaps @@ -1028,7 +1035,9 @@ export DISABLE_RESTART_ON_UPDATE=yes %{_vbox_instdir}/VBoxSharedClipboard.so %{_datadir}/pixmaps/virtualbox.png %{_datadir}/applications/%{name}.desktop +%if 0%{?sle_version} != 120300 %{_datadir}/metainfo/%{name}.appdata.xml +%endif %{_udevrulesdir}/60-vboxdrv.rules %files guest-x11 From d94b70ccef2a52e6028ef57aa0890f1514c6f87798fbf206806aaff730d8c0cc Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 5 Nov 2019 16:19:02 +0000 Subject: [PATCH 4/4] Accepting request 745527 from home:lwfinger:branches:Virtualization - Try to fix unresolvable kernel version in Leap 15.2. OBS-URL: https://build.opensuse.org/request/show/745527 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=520 --- virtualbox.changes | 5 +++++ virtualbox.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/virtualbox.changes b/virtualbox.changes index 093797c..ecdd407 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 5 14:44:08 UTC 2019 - Larry Finger + +- Try to fix unresolvable kernel version in Leap 15.2. + ------------------------------------------------------------------- Sat Nov 2 00:58:22 UTC 2019 - Larry Finger diff --git a/virtualbox.spec b/virtualbox.spec index 306dea1..5f49623 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -178,7 +178,7 @@ BuildRequires: glibc-devel-static BuildRequires: gsoap-devel >= 2.8.50 BuildRequires: java-devel >= 1.6.0 BuildRequires: kbuild >= 0.1.9998svn3101 -#BuildRequires: kernel-syms +BuildRequires: kernel-syms BuildRequires: libcap-devel BuildRequires: libcurl-devel BuildRequires: libelf-devel