forked from pool/virtualbox
Accepting request 736272 from Virtualization
OBS-URL: https://build.opensuse.org/request/show/736272 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=183
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2d3b164c7e
107
fixes_for_5.4.patch
Normal file
107
fixes_for_5.4.patch
Normal file
@ -0,0 +1,107 @@
|
||||
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
|
||||
@@ -443,9 +443,6 @@ 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. */
|
||||
- MY_SET_PAGES_EXEC(&paPages[iPage], 1);
|
||||
-#endif
|
||||
}
|
||||
*pPhys = page_to_phys(paPages);
|
||||
pvRet = phys_to_virt(page_to_phys(paPages));
|
||||
@@ -491,9 +488,6 @@ RTR0DECL(void) RTMemContFree(void *pv, s
|
||||
for (iPage = 0; iPage < cPages; iPage++)
|
||||
{
|
||||
ClearPageReserved(&paPages[iPage]);
|
||||
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */
|
||||
- MY_SET_PAGES_NOEXEC(&paPages[iPage], 1);
|
||||
-#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)
|
||||
{
|
||||
Index: VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
===================================================================
|
||||
--- VirtualBox-6.0.12.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
+++ VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
|
||||
@@ -271,11 +271,13 @@ static void vbox_master_drop(struct drm_
|
||||
|
||||
static struct drm_driver driver = {
|
||||
.driver_features =
|
||||
- DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
|
||||
+ DRIVER_PRIME |
|
||||
+#endif
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
|
||||
DRIVER_IRQ_SHARED |
|
||||
#endif
|
||||
- DRIVER_PRIME,
|
||||
+ DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
|
||||
.dev_priv_size = 0,
|
||||
|
||||
.load = vbox_driver_load,
|
||||
Index: VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
===================================================================
|
||||
--- VirtualBox-6.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
+++ VirtualBox-6.0.12/src/VBox/Additions/linux/drm/vbox_main.c
|
||||
@@ -619,8 +619,12 @@ static inline u64 vbox_bo_mmap_offset(st
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) && !defined(RHEL_70)
|
||||
return bo->bo.addr_space_offset;
|
||||
#else
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
|
||||
+ return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
|
||||
+#else
|
||||
return drm_vma_node_offset_addr(&bo->bo.vma_node);
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
int
|
||||
193
set_graphics_type.patch
Normal file
193
set_graphics_type.patch
Normal file
@ -0,0 +1,193 @@
|
||||
Index: VirtualBox-6.0.12/src/VBox/Main/src-all/Global.cpp
|
||||
===================================================================
|
||||
--- VirtualBox-6.0.12.orig/src/VBox/Main/src-all/Global.cpp
|
||||
+++ VirtualBox-6.0.12/src/VBox/Main/src-all/Global.cpp
|
||||
@@ -183,159 +183,159 @@ const Global::OSType Global::sOSTypes[]
|
||||
|
||||
{ "Linux", "Linux", "Linux22", "Linux 2.2",
|
||||
VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC,
|
||||
- 64, 4, 2 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 64, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Linux24", "Linux 2.4 (32-bit)",
|
||||
VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC,
|
||||
- 128, 16, 4 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 128, 16, 4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Linux24_64", "Linux 2.4 (64-bit)",
|
||||
VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
|
||||
- 128, 16, 4 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 128, 16, 4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Linux26", "Linux 2.6 / 3.x / 4.x (32-bit)",
|
||||
VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 512, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Linux26_64", "Linux 2.6 / 3.x / 4.x (64-bit)",
|
||||
VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "ArchLinux", "Arch Linux (32-bit)",
|
||||
VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "ArchLinux_64", "Arch Linux (64-bit)",
|
||||
VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Debian", "Debian (32-bit)",
|
||||
VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Debian_64", "Debian (64-bit)",
|
||||
VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980},
|
||||
|
||||
{ "Linux", "Linux", "Fedora", "Fedora (32-bit)",
|
||||
VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Fedora_64", "Fedora (64-bit)",
|
||||
VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Gentoo", "Gentoo (32-bit)",
|
||||
VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Gentoo_64", "Gentoo (64-bit)",
|
||||
VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Mandriva", "Mandriva (32-bit)",
|
||||
VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Mandriva_64", "Mandriva (64-bit)",
|
||||
VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Oracle", "Oracle (32-bit)",
|
||||
VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 12 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 12 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Oracle_64", "Oracle (64-bit)",
|
||||
VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 12 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 12 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "RedHat", "Red Hat (32-bit)",
|
||||
VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "RedHat_64", "Red Hat (64-bit)",
|
||||
VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "OpenSUSE", "openSUSE (32-bit)",
|
||||
VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "OpenSUSE_64", "openSUSE (64-bit)",
|
||||
VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Turbolinux", "Turbolinux (32-bit)",
|
||||
VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 384, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 384, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Turbolinux_64", "Turbolinux (64-bit)",
|
||||
VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 384, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 384, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Ubuntu", "Ubuntu (32-bit)",
|
||||
VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 10 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 10 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Ubuntu_64", "Ubuntu (64-bit)",
|
||||
VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
|
||||
| VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 1024, 16, 10 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 1024, 16, 10 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Xandros", "Xandros (32-bit)",
|
||||
VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC,
|
||||
- 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 256, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Xandros_64", "Xandros (64-bit)",
|
||||
VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC,
|
||||
- 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 256, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Linux", "Other Linux (32-bit)",
|
||||
VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 256, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
|
||||
|
||||
{ "Linux", "Linux", "Linux_64", "Other Linux (64-bit)",
|
||||
VBOXOSTYPE_Linux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC
|
||||
| VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
|
||||
- 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
+ 512, 16, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
|
||||
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 },
|
||||
|
||||
{ "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)",
|
||||
@ -1,3 +1,38 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 8 16:28:12 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- added "BuildRequires: pkgconfig(xdamage)" in order to fix build
|
||||
with upcoming changes in libglvnd/Mesa
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 7 14:58:25 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Rework "fixes_for_5.4.patch" to unconditionally remove set_pages_nx() and
|
||||
set_pages_x() as these changes are backported to Kernel:HEAD:KMP.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 2 19:08:58 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Update file "fixes_for_5.4.patch" to handle removal of DRIVER_PRIME and rework of
|
||||
struct ttm_buffer_object.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 26 14:46:23 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Remove BuildRequires for device-mapper as workarounds for OBS bugs are not allowed.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 25 17:22:31 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
|
||||
|
||||
- Added file "set_graphics_type.patch" to set graphics adapter type to VBoxVGA boo#1151896
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
||||
@ -95,6 +95,8 @@ Patch9: vbox-deprec-gsoap-service-proxies.diff
|
||||
#fix failed linking process during build - this patch is just quick workaround
|
||||
Patch10: vbox-gsoapssl-deps.diff
|
||||
#PATCH-FIX-OPENSUSE implement messagebox (VBoxPermissionMessage app), which is displayed, when user
|
||||
# Set graphics adapter type to VBoxVGA boo#1151896
|
||||
Patch98: set_graphics_type.patch
|
||||
#try to start VirtualBox and is not member of vboxusers group
|
||||
Patch99: vbox-permissions_warning.diff
|
||||
#PATCH-FIX-OPENSUSE Do not include build dates on binaries, makes build-compare happier
|
||||
@ -147,6 +149,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
|
||||
@ -209,6 +213,7 @@ BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xau)
|
||||
BuildRequires: pkgconfig(xcomposite)
|
||||
BuildRequires: pkgconfig(xcursor)
|
||||
BuildRequires: pkgconfig(xdamage)
|
||||
BuildRequires: pkgconfig(xdmcp)
|
||||
BuildRequires: pkgconfig(xext)
|
||||
BuildRequires: pkgconfig(xextproto)
|
||||
@ -416,6 +421,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch98 -p1
|
||||
%patch99 -p1
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
@ -449,6 +455,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