forked from pool/virtualbox
Accepting request 560652 from Virtualization
File "fixes_for_4.14.patch" deleted - upstream fix. File "remove_vbox_video_build.patch" added as current versions of Xorg no longer need this component. Version update to 5.2.4 (released 2017-12-19 by Oracle) Version bump to 5.2.2 (released 2017-11-24 by Oracle) Version change to 5.2.0 (released 2017-10-18 by Oracle) OBS-URL: https://build.opensuse.org/request/show/560652 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=152
This commit is contained in:
commit
27c56a5192
@ -1,40 +1,9 @@
|
|||||||
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
||||||
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
||||||
@@ -52,6 +52,10 @@
|
@@ -1237,7 +1237,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
|
||||||
#ifndef _VBOXVIDEO_H_
|
#endif
|
||||||
#define _VBOXVIDEO_H_
|
|
||||||
|
|
||||||
+#if XORG_VERSION_CURRENT >= 11900000
|
|
||||||
+#include <bits/sigset.h>
|
|
||||||
+typedef __sigset_t sigset_t;
|
|
||||||
+#endif
|
|
||||||
#include <VBox/VBoxVideoGuest.h>
|
|
||||||
#include <VBox/VBoxVideo.h>
|
|
||||||
#include "version-generated.h"
|
|
||||||
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/helpers.c
|
|
||||||
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
|
|
||||||
@@ -82,7 +82,11 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p
|
|
||||||
|
|
||||||
property_name = MakeAtom(pszName, strlen(pszName), TRUE);
|
|
||||||
VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
|
|
||||||
+#if XORG_VERSION_CURRENT >= 11900000
|
|
||||||
+ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
|
|
||||||
+#else
|
|
||||||
ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void vbvxReprobeCursor(ScrnInfoPtr pScrn)
|
|
||||||
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
|
||||||
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
|
||||||
@@ -1229,7 +1229,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
|
|
||||||
updateGraphicsCapability(pScrn, TRUE);
|
|
||||||
|
|
||||||
/* Register block and wake-up handlers for getting new screen size hints. */
|
/* Register block and wake-up handlers for getting new screen size hints. */
|
||||||
+#if XORG_VERSION_CURRENT >= 11900000
|
+#if XORG_VERSION_CURRENT >= 11900000
|
||||||
@ -45,33 +14,33 @@ Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
|
|||||||
|
|
||||||
/* software cursor */
|
/* software cursor */
|
||||||
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
|
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
|
||||||
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
|
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||||
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
|
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||||
@@ -15,6 +15,10 @@
|
@@ -36,6 +36,10 @@
|
||||||
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
|
#include "cursorstr.h"
|
||||||
|
#include "servermd.h"
|
||||||
|
|
||||||
|
+#if XORG_VERSION_CURRENT >= 11900000
|
||||||
|
+#include <bits/sigset.h>
|
||||||
|
+typedef __sigset_t sigset_t;
|
||||||
|
+#endif
|
||||||
|
#include "vboxvideo.h"
|
||||||
|
|
||||||
|
#ifdef XORG_7X
|
||||||
|
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||||
|
===================================================================
|
||||||
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||||
|
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||||
|
@@ -36,6 +36,10 @@
|
||||||
|
* Michael Thayer <michael.thayer@oracle.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
+#if XORG_VERSION_CURRENT >= 11900000
|
+#if XORG_VERSION_CURRENT >= 11900000
|
||||||
+#include <bits/sigset.h>
|
+#include <bits/sigset.h>
|
||||||
+typedef __sigset_t sigset_t;
|
+typedef __sigset_t sigset_t;
|
||||||
+#endif
|
+#endif
|
||||||
#include <VBox/VBoxGuestLib.h>
|
#include "misc.h"
|
||||||
|
#include "xf86DDC.h"
|
||||||
#ifndef PCIACCESS
|
#include "xf86Crtc.h"
|
||||||
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/edid.c
|
|
||||||
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
|
|
||||||
@@ -44,6 +44,10 @@
|
|
||||||
* Dave Airlie <airlied@redhat.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#if XORG_VERSION_CURRENT >= 11900000
|
|
||||||
+#include <bits/sigset.h>
|
|
||||||
+typedef __sigset_t sigset_t;
|
|
||||||
+#endif
|
|
||||||
#include <misc.h>
|
|
||||||
#include <xf86DDC.h>
|
|
||||||
#include <xf86Crtc.h>
|
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:0ed518ef98fc43fda87f30e965a7ba524a9c34dcb17885d61fc49f133d5eabf1
|
oid sha256:f18919271750c11c48225a1dbf80565a97d4422cd246301d8d818a6f7e44e5a2
|
||||||
size 4384122
|
size 4434524
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a671fdf68dfe9e2456b9f5d97bf4e72dc4f4ee052a38c650d00f70e55684c1c5
|
|
||||||
size 81803990
|
|
3
VirtualBox-5.2.4-patched.tar.bz2
Normal file
3
VirtualBox-5.2.4-patched.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:3034b2d002cd783efd67e1e0b19a95566cc81a101787c343588e186797a849af
|
||||||
|
size 83292969
|
@ -1,150 +0,0 @@
|
|||||||
Patch VirtualBox source for changes in the kernel API for 4.14.x
|
|
||||||
|
|
||||||
The following issues are addressed:
|
|
||||||
vfs_write() is replaced by kernel_write()
|
|
||||||
symbol SKB_GSO_UDP is removed
|
|
||||||
removal of gamma_set and gamma_get from struct drm_fb_helper_funcs
|
|
||||||
removal of set_busid from struct drm_driver
|
|
||||||
replacement of drm_pci_init() with pci_register_driver()
|
|
||||||
replacement of drm_pci_exit() with pci_unregister_driver()
|
|
||||||
removal of load_lut from struct drm_crtc_helper_func
|
|
||||||
|
|
||||||
This patch is licensed under the MIT license.
|
|
||||||
|
|
||||||
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
|
||||||
|
|
||||||
Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.28.orig/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
|
|
||||||
+++ VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
|
|
||||||
@@ -353,12 +353,17 @@ static void vboxPciFileClose(struct fil
|
|
||||||
static int vboxPciFileWrite(struct file* file, unsigned long long offset, unsigned char* data, unsigned int size)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
|
|
||||||
+
|
|
||||||
+ ret = kernel_write(file, data, size, &offset);
|
|
||||||
+#else
|
|
||||||
mm_segment_t fs_save;
|
|
||||||
|
|
||||||
fs_save = get_fs();
|
|
||||||
set_fs(get_ds());
|
|
||||||
ret = vfs_write(file, data, size, &offset);
|
|
||||||
set_fs(fs_save);
|
|
||||||
+#endif
|
|
||||||
if (ret < 0)
|
|
||||||
printk(KERN_DEBUG "vboxPciFileWrite: error %d\n", ret);
|
|
||||||
|
|
||||||
Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.28.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
||||||
+++ VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
||||||
@@ -124,6 +124,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX
|
|
||||||
# define bstats stats
|
|
||||||
# define qstats stats
|
|
||||||
# endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0)
|
|
||||||
+#define SKB_GSO_UDP 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
|
|
||||||
@@ -722,9 +726,11 @@ static struct sk_buff *vboxNetFltLinuxSk
|
|
||||||
case PDMNETWORKGSOTYPE_IPV4_TCP:
|
|
||||||
fGsoType = SKB_GSO_TCPV4;
|
|
||||||
break;
|
|
||||||
+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
|
|
||||||
case PDMNETWORKGSOTYPE_IPV4_UDP:
|
|
||||||
fGsoType = SKB_GSO_UDP;
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
case PDMNETWORKGSOTYPE_IPV6_TCP:
|
|
||||||
fGsoType = SKB_GSO_TCPV6;
|
|
||||||
break;
|
|
||||||
Index: VirtualBox-5.1.28/src/VBox/Additions/linux/drm/vbox_fb.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.28.orig/src/VBox/Additions/linux/drm/vbox_fb.c
|
|
||||||
+++ VirtualBox-5.1.28/src/VBox/Additions/linux/drm/vbox_fb.c
|
|
||||||
@@ -381,6 +381,7 @@ out:
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
|
|
||||||
static void vbox_fb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
|
|
||||||
u16 blue, int regno)
|
|
||||||
{
|
|
||||||
@@ -394,10 +395,13 @@ static void vbox_fb_gamma_get(struct drm
|
|
||||||
*green = regno;
|
|
||||||
*blue = regno;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static struct drm_fb_helper_funcs vbox_fb_helper_funcs = {
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
|
|
||||||
.gamma_set = vbox_fb_gamma_set,
|
|
||||||
.gamma_get = vbox_fb_gamma_get,
|
|
||||||
+#endif
|
|
||||||
.fb_probe = vboxfb_create,
|
|
||||||
};
|
|
||||||
|
|
||||||
Index: VirtualBox-5.1.28/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.28.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
||||||
+++ VirtualBox-5.1.28/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
||||||
@@ -281,7 +281,7 @@ static struct drm_driver driver =
|
|
||||||
.lastclose = vbox_driver_lastclose,
|
|
||||||
.master_set = vbox_master_set,
|
|
||||||
.master_drop = vbox_master_drop,
|
|
||||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)
|
|
||||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_73)) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
|
|
||||||
.set_busid = drm_pci_set_busid,
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -326,11 +326,19 @@ static int __init vbox_init(void)
|
|
||||||
if (vbox_modeset == 0)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
|
|
||||||
return drm_pci_init(&driver, &vbox_pci_driver);
|
|
||||||
+#else
|
|
||||||
+ return pci_register_driver(&vbox_pci_driver);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
static void __exit vbox_exit(void)
|
|
||||||
{
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
|
|
||||||
drm_pci_exit(&driver, &vbox_pci_driver);
|
|
||||||
+#else
|
|
||||||
+ pci_unregister_driver(&vbox_pci_driver);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
module_init(vbox_init);
|
|
||||||
Index: VirtualBox-5.1.28/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.28.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
||||||
+++ VirtualBox-5.1.28/src/VBox/Additions/linux/drm/vbox_mode.c
|
|
||||||
@@ -152,10 +152,12 @@ static int vbox_set_view(struct drm_crtc
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
|
|
||||||
static void vbox_crtc_load_lut(struct drm_crtc *crtc)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static void vbox_crtc_dpms(struct drm_crtc *crtc, int mode)
|
|
||||||
{
|
|
||||||
@@ -301,7 +303,9 @@ static const struct drm_crtc_helper_func
|
|
||||||
.mode_set = vbox_crtc_mode_set,
|
|
||||||
/* .mode_set_base = vbox_crtc_mode_set_base, */
|
|
||||||
.disable = vbox_crtc_disable,
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
|
|
||||||
.load_lut = vbox_crtc_load_lut,
|
|
||||||
+#endif
|
|
||||||
.prepare = vbox_crtc_prepare,
|
|
||||||
.commit = vbox_crtc_commit,
|
|
||||||
|
|
@ -15,10 +15,27 @@ This patch is released under the MIT license when appropriate, GPLv2 otherwise.
|
|||||||
|
|
||||||
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
||||||
|
|
||||||
Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
|
This patch file makes the necessary changes to the VirtualBox 5.1.30 sources
|
||||||
|
to allow the kernel modules to build with kernel 4.15.
|
||||||
|
|
||||||
|
The API changes are of several types:
|
||||||
|
|
||||||
|
1. The timer initialization routine init_timer_pinned() no longer exists, and
|
||||||
|
is replaced by timer_setup().
|
||||||
|
2. The timer callback routine calling sequence is changed as is the technique
|
||||||
|
for getting the timer information from the callback parameters.
|
||||||
|
3. The calling sequence for drm_encoder_find() is changed.
|
||||||
|
4. The calling sequence for the .get and .set members of the module_param_call()
|
||||||
|
calls have changed.
|
||||||
|
|
||||||
|
This patch is released under the MIT license when appropriate, GPLv2 otherwise.
|
||||||
|
|
||||||
|
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
||||||
|
|
||||||
|
Index: VirtualBox-5.2.2/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.30.orig/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
|
--- VirtualBox-5.2.2.orig/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
|
||||||
+++ VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
|
+++ VirtualBox-5.2.2/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
|
||||||
@@ -715,6 +715,14 @@ static enum hrtimer_restart rtTimerLinux
|
@@ -715,6 +715,14 @@ static enum hrtimer_restart rtTimerLinux
|
||||||
#endif /* RTTIMER_LINUX_WITH_HRTIMER */
|
#endif /* RTTIMER_LINUX_WITH_HRTIMER */
|
||||||
|
|
||||||
@ -61,11 +78,11 @@ Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c
|
|||||||
pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies;
|
pTimer->aSubTimers[iCpu].u.Std.LnxTimer.expires = jiffies;
|
||||||
pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0;
|
pTimer->aSubTimers[iCpu].u.Std.u64NextTS = 0;
|
||||||
}
|
}
|
||||||
Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
Index: VirtualBox-5.2.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.30.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
--- VirtualBox-5.2.2.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
||||||
+++ VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
+++ VirtualBox-5.2.2/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
||||||
@@ -958,7 +958,11 @@ EXPORT_SYMBOL(VBoxGuestIDCCall);
|
@@ -1058,7 +1058,11 @@ void VGDrvNativeISRMousePollEvent(PVBOXG
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
|
||||||
|
|
||||||
/** log and dbg_log parameter setter. */
|
/** log and dbg_log parameter setter. */
|
||||||
@ -77,7 +94,7 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|||||||
{
|
{
|
||||||
if (g_fLoggerCreated)
|
if (g_fLoggerCreated)
|
||||||
{
|
{
|
||||||
@@ -973,7 +973,11 @@ static int vgdrvLinuxParamLogGrpSet(cons
|
@@ -1073,7 +1077,11 @@ static int vgdrvLinuxParamLogGrpSet(cons
|
||||||
}
|
}
|
||||||
|
|
||||||
/** log and dbg_log parameter getter. */
|
/** log and dbg_log parameter getter. */
|
||||||
@ -89,7 +106,7 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|||||||
{
|
{
|
||||||
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
||||||
*pszBuf = '\0';
|
*pszBuf = '\0';
|
||||||
@@ -984,7 +984,11 @@ static int vgdrvLinuxParamLogGrpGet(char
|
@@ -1084,7 +1092,11 @@ static int vgdrvLinuxParamLogGrpGet(char
|
||||||
|
|
||||||
|
|
||||||
/** log and dbg_log_flags parameter setter. */
|
/** log and dbg_log_flags parameter setter. */
|
||||||
@ -101,7 +118,7 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|||||||
{
|
{
|
||||||
if (g_fLoggerCreated)
|
if (g_fLoggerCreated)
|
||||||
{
|
{
|
||||||
@@ -998,7 +998,11 @@ static int vgdrvLinuxParamLogFlagsSet(co
|
@@ -1098,7 +1110,11 @@ static int vgdrvLinuxParamLogFlagsSet(co
|
||||||
}
|
}
|
||||||
|
|
||||||
/** log and dbg_log_flags parameter getter. */
|
/** log and dbg_log_flags parameter getter. */
|
||||||
@ -113,7 +130,7 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|||||||
{
|
{
|
||||||
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
||||||
*pszBuf = '\0';
|
*pszBuf = '\0';
|
||||||
@@ -1009,7 +1009,11 @@ static int vgdrvLinuxParamLogFlagsGet(ch
|
@@ -1109,7 +1125,11 @@ static int vgdrvLinuxParamLogFlagsGet(ch
|
||||||
|
|
||||||
|
|
||||||
/** log and dbg_log_dest parameter setter. */
|
/** log and dbg_log_dest parameter setter. */
|
||||||
@ -125,7 +142,7 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|||||||
{
|
{
|
||||||
if (g_fLoggerCreated)
|
if (g_fLoggerCreated)
|
||||||
{
|
{
|
||||||
@@ -1023,7 +1023,11 @@ static int vgdrvLinuxParamLogDstSet(cons
|
@@ -1123,7 +1143,11 @@ static int vgdrvLinuxParamLogDstSet(cons
|
||||||
}
|
}
|
||||||
|
|
||||||
/** log and dbg_log_dest parameter getter. */
|
/** log and dbg_log_dest parameter getter. */
|
||||||
@ -137,7 +154,7 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|||||||
{
|
{
|
||||||
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
PRTLOGGER pLogger = pParam->name[0] == 'd' ? RTLogDefaultInstance() : RTLogRelGetDefaultInstance();
|
||||||
*pszBuf = '\0';
|
*pszBuf = '\0';
|
||||||
@@ -1034,7 +1034,11 @@ static int vgdrvLinuxParamLogDstGet(char
|
@@ -1134,7 +1158,11 @@ static int vgdrvLinuxParamLogDstGet(char
|
||||||
|
|
||||||
|
|
||||||
/** r3_log_to_host parameter setter. */
|
/** r3_log_to_host parameter setter. */
|
||||||
@ -149,7 +166,7 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|||||||
{
|
{
|
||||||
if ( pszValue == NULL
|
if ( pszValue == NULL
|
||||||
|| *pszValue == '\0'
|
|| *pszValue == '\0'
|
||||||
@@ -1052,7 +1052,11 @@ static int vgdrvLinuxParamR3LogToHostSet
|
@@ -1152,7 +1180,11 @@ static int vgdrvLinuxParamR3LogToHostSet
|
||||||
}
|
}
|
||||||
|
|
||||||
/** r3_log_to_host parameter getter. */
|
/** r3_log_to_host parameter getter. */
|
||||||
@ -161,12 +178,15 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
|
|||||||
{
|
{
|
||||||
strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
|
strcpy(pszBuf, g_DevExt.fLoggingEnabled ? "enabled" : "disabled");
|
||||||
return strlen(pszBuf);
|
return strlen(pszBuf);
|
||||||
Index: VirtualBox-5.1.30/src/VBox/Additions/linux/drm/vbox_mode.c
|
Index: VirtualBox-5.2.2/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.30.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
--- VirtualBox-5.2.2.orig/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||||
+++ VirtualBox-5.1.30/src/VBox/Additions/linux/drm/vbox_mode.c
|
+++ VirtualBox-5.2.2/src/VBox/Additions/linux/drm/vbox_mode.c
|
||||||
@@ -369,7 +369,12 @@ static struct drm_encoder *vbox_best_sin
|
@@ -398,11 +398,15 @@ static struct drm_encoder *vbox_best_sin
|
||||||
LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, connector));
|
*connector)
|
||||||
|
{
|
||||||
|
int enc_id = connector->encoder_ids[0];
|
||||||
|
-
|
||||||
/* pick the encoder ids */
|
/* pick the encoder ids */
|
||||||
if (enc_id)
|
if (enc_id)
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||||
@ -174,7 +194,21 @@ Index: VirtualBox-5.1.30/src/VBox/Additions/linux/drm/vbox_mode.c
|
|||||||
+#else
|
+#else
|
||||||
return drm_encoder_find(connector->dev, enc_id);
|
return drm_encoder_find(connector->dev, enc_id);
|
||||||
+#endif
|
+#endif
|
||||||
+
|
|
||||||
LogFunc(("vboxvideo: %d\n", __LINE__));
|
+ LogFunc(("vboxvideo: %d\n", __LINE__));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Index: VirtualBox-5.2.2/configure
|
||||||
|
===================================================================
|
||||||
|
--- VirtualBox-5.2.2.orig/configure
|
||||||
|
+++ VirtualBox-5.2.2/configure
|
||||||
|
@@ -1538,7 +1538,7 @@ EOF
|
||||||
|
INCQT5=`strip_I "$FLGQT5"`
|
||||||
|
LIBDIR5=`pkg-config Qt5Core --variable=libdir`
|
||||||
|
LIBQT5=`pkg-config Qt5Core --libs`
|
||||||
|
- LIBQT5="-L$LIBDIR5 $LIBQT5"
|
||||||
|
+ LIBQT5="-L$LIBDIR5 $LIBQT5 -std=c++11"
|
||||||
|
TOOLQT5=`pkg-config Qt5Core --variable=prefix`
|
||||||
|
TOOLQT5BIN=`pkg-config Qt5Core --variable=host_bins`
|
||||||
|
if test_compile "$LIBQT5 $LIBPTHREAD $FLGQT5" qt5 qt5 nofatal; then
|
||||||
|
@ -1,21 +1,8 @@
|
|||||||
Index: VirtualBox-5.1.10/Config.kmk
|
Index: VirtualBox-5.2.0/configure
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.10.orig/Config.kmk
|
--- VirtualBox-5.2.0.orig/configure
|
||||||
+++ VirtualBox-5.1.10/Config.kmk
|
+++ VirtualBox-5.2.0/configure
|
||||||
@@ -2479,7 +2479,7 @@ else
|
@@ -429,8 +429,13 @@ check_gcc()
|
||||||
# Some versions of gcc (e.g. openSUSE11) return only major.minor on `gcc -dumpversion`.
|
|
||||||
# gcc-5 of openSUSE42.1 only returns the major version on `gcc -dumpversion`!
|
|
||||||
VBOX_GCC_VERSION = $(shell \
|
|
||||||
- $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
|
|
||||||
+ $(1) -dumpversion | $(SED_EXT) 's|\([0-9]\)\.\{0,1\}\([0-9]\{0,1\}\)\.\{0,1\}\([0-9]\{0,1\}\).*|$$(int-add $$(int-mul 10000, \1), $$(int-mul 100, $$(firstword \2 0)), $$(firstword \3 0))|' )
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Find MinGW cross compilers for EFI on non-windows systems. We need to probe
|
|
||||||
Index: VirtualBox-5.1.10/configure
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.10.orig/configure
|
|
||||||
+++ VirtualBox-5.1.10/configure
|
|
||||||
@@ -433,8 +433,13 @@ check_gcc()
|
|
||||||
log_failure "cannot execute '$CXX -dumpversion'"
|
log_failure "cannot execute '$CXX -dumpversion'"
|
||||||
fail really
|
fail really
|
||||||
fi
|
fi
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.26.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||||
+++ VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||||
@@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \
|
@@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \
|
||||||
ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
|
ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
|
||||||
vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
|
vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
|
||||||
@ -12,61 +12,48 @@ Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
|||||||
vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
|
vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
|
||||||
vboxvideo_15_DEFS := \
|
vboxvideo_15_DEFS := \
|
||||||
$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_
|
$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_
|
||||||
Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/edid.c
|
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.26.orig/src/VBox/Additions/x11/vboxvideo/edid.c
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||||
+++ VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/edid.c
|
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/edid.c
|
||||||
@@ -44,10 +44,6 @@
|
@@ -36,10 +36,6 @@
|
||||||
* Dave Airlie <airlied@redhat.com>
|
* Michael Thayer <michael.thayer@oracle.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
-#if XORG_VERSION_CURRENT >= 11900000
|
-#if XORG_VERSION_CURRENT >= 11900000
|
||||||
-#include <bits/sigset.h>
|
-#include <bits/sigset.h>
|
||||||
-typedef __sigset_t sigset_t;
|
-typedef __sigset_t sigset_t;
|
||||||
-#endif
|
-#endif
|
||||||
#include <misc.h>
|
#include "misc.h"
|
||||||
#include <xf86DDC.h>
|
#include "xf86DDC.h"
|
||||||
#include <xf86Crtc.h>
|
#include "xf86Crtc.h"
|
||||||
Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/pointer.c
|
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.26.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||||
+++ VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/pointer.c
|
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/pointer.c
|
||||||
@@ -15,10 +15,6 @@
|
@@ -36,10 +36,6 @@
|
||||||
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
|
#include "cursorstr.h"
|
||||||
*/
|
#include "servermd.h"
|
||||||
|
|
||||||
-#if XORG_VERSION_CURRENT >= 11900000
|
-#if XORG_VERSION_CURRENT >= 11900000
|
||||||
-#include <bits/sigset.h>
|
-#include <bits/sigset.h>
|
||||||
-typedef __sigset_t sigset_t;
|
-typedef __sigset_t sigset_t;
|
||||||
-#endif
|
-#endif
|
||||||
#include <VBox/VBoxGuestLib.h>
|
#include "vboxvideo.h"
|
||||||
|
|
||||||
#ifndef PCIACCESS
|
#ifdef XORG_7X
|
||||||
Index: VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.26.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
||||||
+++ VirtualBox-5.1.26/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
||||||
@@ -52,10 +52,6 @@
|
@@ -42,8 +42,8 @@
|
||||||
#ifndef _VBOXVIDEO_H_
|
#ifndef _VBOXVIDEO_H_
|
||||||
#define _VBOXVIDEO_H_
|
#define _VBOXVIDEO_H_
|
||||||
|
|
||||||
-#if XORG_VERSION_CURRENT >= 11900000
|
-#include <VBoxVideoGuest.h>
|
||||||
-#include <bits/sigset.h>
|
-#include <VBoxVideo.h>
|
||||||
-typedef __sigset_t sigset_t;
|
+#include <VBox/Graphics/VBoxVideoGuest.h>
|
||||||
-#endif
|
+#include <VBox/Graphics/VBoxVideo.h>
|
||||||
#include <VBox/VBoxVideoGuest.h>
|
|
||||||
#include <VBox/VBoxVideo.h>
|
|
||||||
#include "version-generated.h"
|
#include "version-generated.h"
|
||||||
Index: VirtualBox-5.1.26/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
|
||||||
===================================================================
|
#define VBOX_VENDORID 0x80EE
|
||||||
--- VirtualBox-5.1.26.orig/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
|
||||||
+++ VirtualBox-5.1.26/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk
|
|
||||||
@@ -103,7 +103,7 @@ if defined(VBOX_WITH_EXTPACK_VBOXDTRACE)
|
|
||||||
VBoxDTraceCmd_TEMPLATE = VBoxR3ExtPackDTrace
|
|
||||||
VBoxDTraceCmd_DEFS = RTMEM_WRAP_TO_EF_APIS VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME=\"$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)\"
|
|
||||||
#VBoxDTraceCmd_DEFS += YYDEBUG
|
|
||||||
- VBoxDTraceCmd_DEFS.linux = _XOPEN_SOURCE=700
|
|
||||||
+ VBoxDTraceCmd_DEFS.linux = _XOPEN_SOURCE=700 _DEFAULT_SOURCE
|
|
||||||
VBoxDTraceCmd_DEFS.win = YY_USE_PROTOS=1 YYENABLE_NLS=0 YYLTYPE_IS_TRIVIAL=0
|
|
||||||
VBoxDTraceCmd_SDKS = VBOX_ZLIB
|
|
||||||
ifn1of ($(KBUILD_TARGET), win)
|
|
||||||
|
@ -1,19 +1,7 @@
|
|||||||
Index: VirtualBox-5.1.22/src/VBox/Additions/linux/drm/vbox_ttm.c
|
Index: VirtualBox-5.2.0/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.22.orig/src/VBox/Additions/linux/drm/vbox_ttm.c
|
--- VirtualBox-5.2.0.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||||
+++ VirtualBox-5.1.22/src/VBox/Additions/linux/drm/vbox_ttm.c
|
+++ VirtualBox-5.2.0/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
||||||
@@ -231,7 +231,6 @@ static int vbox_bo_move(struct ttm_buffe
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
-
|
|
||||||
static void vbox_ttm_backend_destroy(struct ttm_tt *tt)
|
|
||||||
{
|
|
||||||
ttm_tt_fini(tt);
|
|
||||||
Index: VirtualBox-5.1.22/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
|
||||||
===================================================================
|
|
||||||
--- VirtualBox-5.1.22.orig/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
|
||||||
+++ VirtualBox-5.1.22/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c
|
|
||||||
@@ -35,7 +35,7 @@
|
@@ -35,7 +35,7 @@
|
||||||
#include <iprt/assert.h>
|
#include <iprt/assert.h>
|
||||||
#include <iprt/err.h>
|
#include <iprt/err.h>
|
||||||
|
39
remove_vbox_video_build.patch
Normal file
39
remove_vbox_video_build.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
Index: VirtualBox-5.2.4/Makefile.kmk
|
||||||
|
===================================================================
|
||||||
|
--- VirtualBox-5.2.4.orig/Makefile.kmk
|
||||||
|
+++ VirtualBox-5.2.4/Makefile.kmk
|
||||||
|
@@ -701,7 +701,6 @@ VBOX_CORE_DOXYFILE_INPUT_DIRS = \
|
||||||
|
src/VBox/Additions/x11/vboxmouse \
|
||||||
|
src/VBox/Additions/x11/vboxmouse/xorg70 \
|
||||||
|
src/VBox/Additions/x11/vboxmouse/xorg71 \
|
||||||
|
- src/VBox/Additions/x11/vboxvideo \
|
||||||
|
src/VBox/NetworkServices \
|
||||||
|
src/VBox/NetworkServices/DHCP \
|
||||||
|
src/VBox/NetworkServices/NAT \
|
||||||
|
Index: VirtualBox-5.2.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||||
|
===================================================================
|
||||||
|
--- VirtualBox-5.2.4.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||||
|
+++ VirtualBox-5.2.4/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
||||||
|
@@ -395,7 +395,8 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
|
||||||
|
vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
|
||||||
|
vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
|
||||||
|
|
||||||
|
-ifdef VBOX_USE_SYSTEM_XORG_HEADERS
|
||||||
|
+# Fix to never build
|
||||||
|
+ifdef XX_VBOX_USE_SYSTEM_XORG_HEADERS
|
||||||
|
# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
|
||||||
|
DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
|
||||||
|
SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
|
||||||
|
Index: VirtualBox-5.2.4/src/VBox/Additions/x11/Makefile.kmk
|
||||||
|
===================================================================
|
||||||
|
--- VirtualBox-5.2.4.orig/src/VBox/Additions/x11/Makefile.kmk
|
||||||
|
+++ VirtualBox-5.2.4/src/VBox/Additions/x11/Makefile.kmk
|
||||||
|
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
|
||||||
|
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
|
||||||
|
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
|
||||||
|
ifndef VBOX_NO_LEGACY_XORG_X11
|
||||||
|
- include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
|
||||||
|
+# include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
|
||||||
|
ifn1of ($(KBUILD_TARGET), netbsd solaris)
|
||||||
|
include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
|
||||||
|
endif
|
@ -1,21 +1,23 @@
|
|||||||
Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
Index: VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
--- VirtualBox-5.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||||
+++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
+++ VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
|
||||||
@@ -68,7 +68,7 @@ void UIGlobalSettingsUpdate::loadToCache
|
@@ -110,8 +110,8 @@ void UIGlobalSettingsUpdate::getFromCach
|
||||||
void UIGlobalSettingsUpdate::getFromCache()
|
/* Get old update data from the cache: */
|
||||||
{
|
const UIDataSettingsGlobalUpdate &oldUpdateData = m_pCache->base();
|
||||||
/* Apply internal variables data to QWidget(s): */
|
|
||||||
- m_pCheckBoxUpdate->setChecked(m_cache.m_fCheckEnabled);
|
- /* Load old update data from the cache: */
|
||||||
|
- m_pCheckBoxUpdate->setChecked(oldUpdateData.m_fCheckEnabled);
|
||||||
|
+ /* Disable old update data from the cache: */
|
||||||
+ m_pCheckBoxUpdate->setChecked(false);
|
+ m_pCheckBoxUpdate->setChecked(false);
|
||||||
if (m_pCheckBoxUpdate->isChecked())
|
if (m_pCheckBoxUpdate->isChecked())
|
||||||
{
|
{
|
||||||
m_pComboBoxUpdatePeriod->setCurrentIndex(m_cache.m_periodIndex);
|
m_pComboBoxUpdatePeriod->setCurrentIndex(oldUpdateData.m_periodIndex);
|
||||||
Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
Index: VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.2.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
--- VirtualBox-5.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||||
+++ VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
+++ VirtualBox-5.2.0/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
|
||||||
@@ -104,16 +104,6 @@ UISettingsDialogGlobal::UISettingsDialog
|
@@ -103,16 +103,6 @@ UISettingsDialogGlobal::UISettingsDialog
|
||||||
iPageIndex, "#input", pSettingsPage);
|
iPageIndex, "#input", pSettingsPage);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -32,7 +34,7 @@ Index: VirtualBox-5.1.2/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDia
|
|||||||
/* Language page: */
|
/* Language page: */
|
||||||
case GlobalSettingsPageType_Language:
|
case GlobalSettingsPageType_Language:
|
||||||
{
|
{
|
||||||
@@ -252,8 +242,6 @@ void UISettingsDialogGlobal::retranslate
|
@@ -248,8 +238,6 @@ void UISettingsDialogGlobal::retranslate
|
||||||
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
|
m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
|
||||||
|
|
||||||
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
Index: VirtualBox-5.2.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/VBox/Frontends/VBoxFB/VBoxFB.cpp.orig
|
--- VirtualBox-5.2.0.orig/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||||
+++ src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
+++ VirtualBox-5.2.0/src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
||||||
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
|
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
printf("VirtualBox DirectFB GUI built %s %s\n"
|
printf("VirtualBox DirectFB GUI built %s %s\n"
|
||||||
@ -11,11 +11,11 @@ Index: src/VBox/Frontends/VBoxFB/VBoxFB.cpp
|
|||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
Index: src/VBox/Runtime/common/string/uniread.cpp
|
Index: VirtualBox-5.2.0/src/VBox/Runtime/common/string/uniread.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/VBox/Runtime/common/string/uniread.cpp.orig
|
--- VirtualBox-5.2.0.orig/src/VBox/Runtime/common/string/uniread.cpp
|
||||||
+++ src/VBox/Runtime/common/string/uniread.cpp
|
+++ VirtualBox-5.2.0/src/VBox/Runtime/common/string/uniread.cpp
|
||||||
@@ -1035,7 +1035,7 @@ int PrintHeader(const char *argv0, const
|
@@ -1036,7 +1036,7 @@ int PrintHeader(const char *argv0, const
|
||||||
" * IPRT - Unicode Tables.\n"
|
" * IPRT - Unicode Tables.\n"
|
||||||
" *\n"
|
" *\n"
|
||||||
" * Automatically Generated from %s\n"
|
" * Automatically Generated from %s\n"
|
||||||
@ -24,10 +24,10 @@ Index: src/VBox/Runtime/common/string/uniread.cpp
|
|||||||
" */\n"
|
" */\n"
|
||||||
"\n"
|
"\n"
|
||||||
"/*\n"
|
"/*\n"
|
||||||
Index: src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c.orig
|
--- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||||
+++ src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
+++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
||||||
@@ -42,16 +42,13 @@
|
@@ -42,16 +42,13 @@
|
||||||
/**************************IDENTITY AND VERSIONING***********************/
|
/**************************IDENTITY AND VERSIONING***********************/
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
@ -50,10 +50,10 @@ Index: src/libs/xpcom18a4/nsprpub/lib/libc/src/plvrsion.c
|
|||||||
#if !defined(_PRODUCTION)
|
#if !defined(_PRODUCTION)
|
||||||
#define _PRODUCTION ""
|
#define _PRODUCTION ""
|
||||||
#endif
|
#endif
|
||||||
Index: src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c.orig
|
--- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||||
+++ src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
+++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
||||||
@@ -44,16 +44,10 @@
|
@@ -44,16 +44,10 @@
|
||||||
#ifndef XP_MAC
|
#ifndef XP_MAC
|
||||||
#include "_pr_bld.h"
|
#include "_pr_bld.h"
|
||||||
@ -73,10 +73,10 @@ Index: src/libs/xpcom18a4/nsprpub/pr/src/prvrsion.c
|
|||||||
#if !defined(_PRODUCTION)
|
#if !defined(_PRODUCTION)
|
||||||
#define _PRODUCTION ""
|
#define _PRODUCTION ""
|
||||||
#endif
|
#endif
|
||||||
Index: src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c.orig
|
--- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||||
+++ src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
+++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
||||||
@@ -42,16 +42,13 @@
|
@@ -42,16 +42,13 @@
|
||||||
/**************************IDENTITY AND VERSIONING***********************/
|
/**************************IDENTITY AND VERSIONING***********************/
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
@ -99,10 +99,10 @@ Index: src/libs/xpcom18a4/nsprpub/lib/prstreams/plvrsion.c
|
|||||||
#if !defined(_PRODUCTION)
|
#if !defined(_PRODUCTION)
|
||||||
#define _PRODUCTION ""
|
#define _PRODUCTION ""
|
||||||
#endif
|
#endif
|
||||||
Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
Index: VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c.orig
|
--- VirtualBox-5.2.0.orig/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||||
+++ src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
+++ VirtualBox-5.2.0/src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
||||||
@@ -42,16 +42,13 @@
|
@@ -42,16 +42,13 @@
|
||||||
/**************************IDENTITY AND VERSIONING***********************/
|
/**************************IDENTITY AND VERSIONING***********************/
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
@ -125,10 +125,10 @@ Index: src/libs/xpcom18a4/nsprpub/lib/ds/plvrsion.c
|
|||||||
#if !defined(_PRODUCTION)
|
#if !defined(_PRODUCTION)
|
||||||
#define _PRODUCTION ""
|
#define _PRODUCTION ""
|
||||||
#endif
|
#endif
|
||||||
Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
Index: VirtualBox-5.2.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp.orig
|
--- VirtualBox-5.2.0.orig/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
||||||
+++ src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
+++ VirtualBox-5.2.0/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
||||||
@@ -148,7 +148,7 @@ static int vboxInitLogging(const char *p
|
@@ -148,7 +148,7 @@ static int vboxInitLogging(const char *p
|
||||||
#endif
|
#endif
|
||||||
"Log opened %s\n",
|
"Log opened %s\n",
|
||||||
@ -138,10 +138,10 @@ Index: src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp
|
|||||||
|
|
||||||
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
||||||
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
if (RT_SUCCESS(vrc) || vrc == VERR_BUFFER_OVERFLOW)
|
||||||
Index: src/VBox/Devices/PC/BIOS/bios.c
|
Index: VirtualBox-5.2.0/src/VBox/Devices/PC/BIOS/bios.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/VBox/Devices/PC/BIOS/bios.c.orig
|
--- VirtualBox-5.2.0.orig/src/VBox/Devices/PC/BIOS/bios.c
|
||||||
+++ src/VBox/Devices/PC/BIOS/bios.c
|
+++ VirtualBox-5.2.0/src/VBox/Devices/PC/BIOS/bios.c
|
||||||
@@ -159,7 +159,7 @@ void set_mode(uint8_t mode);
|
@@ -159,7 +159,7 @@ void set_mode(uint8_t mode);
|
||||||
|
|
||||||
#define BX_PCIBIOS 1
|
#define BX_PCIBIOS 1
|
||||||
@ -151,24 +151,11 @@ Index: src/VBox/Devices/PC/BIOS/bios.c
|
|||||||
//--------------------------------------------------------------------------
|
//--------------------------------------------------------------------------
|
||||||
// print_bios_banner
|
// print_bios_banner
|
||||||
// displays a the bios version
|
// displays a the bios version
|
||||||
Index: src/VBox/Main/glue/com.cpp
|
Index: VirtualBox-5.2.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- src/VBox/Main/glue/com.cpp.orig
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||||
+++ src/VBox/Main/glue/com.cpp
|
+++ VirtualBox-5.2.0/src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
||||||
@@ -283,7 +283,7 @@ static DECLCALLBACK(void) vboxHeaderFoot
|
@@ -242,7 +242,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
|
||||||
#endif
|
|
||||||
"Log opened %s\n",
|
|
||||||
g_pszLogEntity, VBOX_VERSION_STRING, RTBldCfgRevision(),
|
|
||||||
- RTBldCfgTargetDotArch(), __DATE__, __TIME__, szTmp);
|
|
||||||
+ RTBldCfgTargetDotArch(), "openSUSE", "Buildservice", szTmp);
|
|
||||||
|
|
||||||
pfnLog(pReleaseLogger, "Build Type: %s\n", KBUILD_TYPE);
|
|
||||||
int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_PRODUCT, szTmp, sizeof(szTmp));
|
|
||||||
Index: src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
|
||||||
===================================================================
|
|
||||||
--- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig
|
|
||||||
+++ src/VBox/Additions/common/VBoxService/VBoxService.cpp
|
|
||||||
@@ -241,7 +241,7 @@ static DECLCALLBACK(void) vgsvcLogHeader
|
|
||||||
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
|
"VBoxService %s r%s (verbosity: %u) %s (%s %s) release log\n"
|
||||||
"Log opened %s\n",
|
"Log opened %s\n",
|
||||||
RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
|
RTBldCfgVersion(), RTBldCfgRevisionStr(), g_cVerbosity, VBOX_BUILD_TARGET,
|
||||||
|
@ -14,7 +14,7 @@ Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
|
+++ VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
|
||||||
@@ -0,0 +1,35 @@
|
@@ -0,0 +1,32 @@
|
||||||
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
||||||
+## @file
|
+## @file
|
||||||
+#
|
+#
|
||||||
@ -41,10 +41,7 @@ Index: VirtualBox-4.3.6/src/apps/VBoxPermissionMessage/Makefile.kmk
|
|||||||
+VBoxPermissionMessage_TEMPLATE = VBOXQTGUIEXE
|
+VBoxPermissionMessage_TEMPLATE = VBOXQTGUIEXE
|
||||||
+VBoxPermissionMessage_SOURCES = VBoxPermissionMessage.cpp
|
+VBoxPermissionMessage_SOURCES = VBoxPermissionMessage.cpp
|
||||||
+VBoxPermissionMessage_QT_MODULES = Core Gui
|
+VBoxPermissionMessage_QT_MODULES = Core Gui
|
||||||
+ifdef VBOX_WITH_QTGUI_V5
|
|
||||||
+ # Qt5 requires additional modules:
|
|
||||||
+VBoxPermissionMessage_QT_MODULES += Widgets
|
+VBoxPermissionMessage_QT_MODULES += Widgets
|
||||||
+endif # VBOX_WITH_QTGUI_V5
|
|
||||||
+
|
+
|
||||||
+#INSTALLS += VBoxPermissionMessage
|
+#INSTALLS += VBoxPermissionMessage
|
||||||
+
|
+
|
||||||
|
@ -14,7 +14,7 @@ Index: VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
+++ VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
||||||
@@ -0,0 +1,33 @@
|
@@ -0,0 +1,30 @@
|
||||||
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
+# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $
|
||||||
+## @file
|
+## @file
|
||||||
+#
|
+#
|
||||||
@ -38,10 +38,7 @@ Index: VirtualBox-5.1.22/src/apps/VBoxUSB_DevRules/Makefile.kmk
|
|||||||
+VBoxUSB_DevRules_TEMPLATE = VBOXQTGUIEXE
|
+VBoxUSB_DevRules_TEMPLATE = VBOXQTGUIEXE
|
||||||
+VBoxUSB_DevRules_SOURCES = VBoxUSB_DevRules.cpp
|
+VBoxUSB_DevRules_SOURCES = VBoxUSB_DevRules.cpp
|
||||||
+VBoxUSB_DevRules_QT_MODULES = Core Gui
|
+VBoxUSB_DevRules_QT_MODULES = Core Gui
|
||||||
+ifdef VBOX_WITH_QTGUI_V5
|
|
||||||
+ # Qt5 requires additional modules:
|
|
||||||
+VBoxUSB_DevRules_QT_MODULES += Widgets
|
+VBoxUSB_DevRules_QT_MODULES += Widgets
|
||||||
+endif # VBOX_WITH_QTGUI_V5
|
|
||||||
+
|
+
|
||||||
+#INSTALLS += VBoxUSB_DevRules
|
+#INSTALLS += VBoxUSB_DevRules
|
||||||
+
|
+
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.24.orig/src/VBox/Additions/linux/installer/vboxadd.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||||
+++ VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
+++ VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd.sh
|
||||||
@@ -25,11 +25,14 @@
|
@@ -25,11 +25,14 @@
|
||||||
# Provides: vboxadd
|
# Provides: vboxadd
|
||||||
# Required-Start:
|
# Required-Start:
|
||||||
@ -18,7 +18,7 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
|
|
||||||
## @todo This file duplicates a lot of script with vboxdrv.sh. When making
|
## @todo This file duplicates a lot of script with vboxdrv.sh. When making
|
||||||
@@ -112,18 +115,9 @@ fail()
|
@@ -129,18 +132,9 @@ log()
|
||||||
|
|
||||||
dev=/dev/vboxguest
|
dev=/dev/vboxguest
|
||||||
userdev=/dev/vboxuser
|
userdev=/dev/vboxuser
|
||||||
@ -37,7 +37,7 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
running_vboxguest()
|
running_vboxguest()
|
||||||
{
|
{
|
||||||
lsmod | grep -q "vboxguest[^_-]"
|
lsmod | grep -q "vboxguest[^_-]"
|
||||||
@@ -166,12 +160,6 @@ do_vboxguest_non_udev()
|
@@ -183,12 +177,6 @@ do_vboxguest_non_udev()
|
||||||
fail "Cannot create device $dev with major $maj and minor $min"
|
fail "Cannot create device $dev with major $maj and minor $min"
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
@ -50,7 +50,7 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
|
|
||||||
if [ ! -c $userdev ]; then
|
if [ ! -c $userdev ]; then
|
||||||
maj=10
|
maj=10
|
||||||
@@ -182,12 +170,6 @@ do_vboxguest_non_udev()
|
@@ -199,12 +187,6 @@ do_vboxguest_non_udev()
|
||||||
rmmod vboxguest 2>/dev/null
|
rmmod vboxguest 2>/dev/null
|
||||||
fail "Cannot create device $userdev with major $maj and minor $min"
|
fail "Cannot create device $userdev with major $maj and minor $min"
|
||||||
}
|
}
|
||||||
@ -63,8 +63,8 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -197,9 +179,8 @@ start()
|
@@ -214,9 +196,8 @@ start()
|
||||||
begin "Starting the VirtualBox Guest Additions" console;
|
begin "Starting."
|
||||||
# If we got this far assume that the slow set-up has been done.
|
# If we got this far assume that the slow set-up has been done.
|
||||||
QUICKSETUP=yes
|
QUICKSETUP=yes
|
||||||
- if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
|
- if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
|
||||||
@ -75,19 +75,20 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
no_udev=1
|
no_udev=1
|
||||||
running_vboxguest || {
|
running_vboxguest || {
|
||||||
rm -f $dev || {
|
rm -f $dev || {
|
||||||
@@ -213,7 +194,6 @@ start()
|
@@ -229,7 +210,7 @@ start()
|
||||||
|
|
||||||
$MODPROBE vboxguest >/dev/null 2>&1 || {
|
$MODPROBE vboxguest >/dev/null 2>&1 || {
|
||||||
setup
|
setup
|
||||||
$MODPROBE vboxguest >/dev/null 2>&1 || {
|
- $MODPROBE vboxguest >/dev/null 2>&1 ||
|
||||||
- ${INSTALL_DIR}/init/vboxadd-x11 cleanup
|
+ $MODPROBE vboxguest >/dev/null 2>&1 || {
|
||||||
fail "modprobe vboxguest failed"
|
fail "modprobe vboxguest failed"
|
||||||
}
|
}
|
||||||
}
|
case "$no_udev" in 1)
|
||||||
@@ -238,14 +218,15 @@ start()
|
@@ -252,14 +233,15 @@ start()
|
||||||
fi # INSTALL_NO_MODULE_BUILDS
|
fi # INSTALL_NO_MODULE_BUILDS
|
||||||
|
|
||||||
# Put the X.Org driver in place. This is harmless if it is not needed.
|
# Put the X.Org driver in place. This is harmless if it is not needed.
|
||||||
- /sbin/rcvboxadd-x11 setup
|
- "${INSTALL_DIR}/init/vboxadd-x11" setup 2>> "${LOG}"
|
||||||
+ #/sbin/rcvboxadd-x11 setup
|
+ #/sbin/rcvboxadd-x11 setup
|
||||||
# Install the guest OpenGL drivers. For now we don't support
|
# Install the guest OpenGL drivers. For now we don't support
|
||||||
# multi-architecture installations
|
# multi-architecture installations
|
||||||
@ -101,7 +102,7 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
# SELinux for the OpenGL libraries, so that gdm can load them during the
|
# SELinux for the OpenGL libraries, so that gdm can load them during the
|
||||||
# acceleration support check. This prevents an "Oh no, something has gone
|
# acceleration support check. This prevents an "Oh no, something has gone
|
||||||
# wrong!" error when starting EL7 guests.
|
# wrong!" error when starting EL7 guests.
|
||||||
@@ -256,6 +237,15 @@ start()
|
@@ -270,6 +252,15 @@ start()
|
||||||
chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
|
chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1"
|
||||||
fi
|
fi
|
||||||
echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf
|
echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf
|
||||||
@ -117,7 +118,7 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
fi
|
fi
|
||||||
ldconfig
|
ldconfig
|
||||||
|
|
||||||
@@ -396,9 +386,9 @@ create_udev_rule()
|
@@ -408,9 +399,9 @@ create_udev_rule()
|
||||||
echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
|
echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -130,29 +131,28 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
# And a post-installation script for rebuilding modules when a new kernel
|
# And a post-installation script for rebuilding modules when a new kernel
|
||||||
# is installed.
|
# is installed.
|
||||||
mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
|
mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d
|
||||||
@@ -429,47 +419,18 @@ shared_folder_setup()
|
@@ -440,45 +431,21 @@ shared_folder_setup()
|
||||||
## @todo It would be nicer if the kernel module just parsed parameters
|
## @todo It would be nicer if the kernel module just parsed parameters
|
||||||
# itself instead of needing a separate binary to do that.
|
# itself instead of needing a separate binary to do that.
|
||||||
ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin
|
ln -sf "${INSTALL_DIR}/other/mount.vboxsf" /sbin
|
||||||
- # SELinux security context for the mount helper.
|
- # SELinux security context for the mount helper.
|
||||||
- if test -e /etc/selinux/config; then
|
- if test -e /etc/selinux/config; then
|
||||||
- # This is correct. semanage maps this to the real path, and it aborts
|
- # This is correct. semanage maps this to the real path, and it aborts
|
||||||
- # with an error, telling you what you should have typed, if you specify
|
- # with an error, telling you what you should have typed, if you specify
|
||||||
- # the real path. The "chcon" is there as a back-up for old guests.
|
- # the real path. The "chcon" is there as a back-up for old guests.
|
||||||
- command -v semanage > /dev/null &&
|
- command -v semanage > /dev/null &&
|
||||||
- semanage fcontext -a -t mount_exec_t "/usr/lib/$PACKAGE/mount.vboxsf"
|
- semanage fcontext -a -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf"
|
||||||
- chcon -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf"
|
- chcon -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf"
|
||||||
- fi
|
- fi
|
||||||
- succ_msg
|
+ succ_msg
|
||||||
-}
|
}
|
||||||
-
|
|
||||||
# setup_script
|
# setup_script
|
||||||
setup()
|
setup()
|
||||||
{
|
{
|
||||||
- export BUILD_TYPE
|
- export BUILD_TYPE
|
||||||
- export USERNAME
|
- export USERNAME
|
||||||
-
|
-
|
||||||
- rm -f $LOG
|
|
||||||
- MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
|
- MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
|
||||||
- BUILDINTMP="$MODULE_SRC/build_in_tmp"
|
- BUILDINTMP="$MODULE_SRC/build_in_tmp"
|
||||||
- chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
|
- chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
|
||||||
@ -164,7 +164,7 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
- test -n "${QUICKSETUP}" && return 0
|
- test -n "${QUICKSETUP}" && return 0
|
||||||
- shared_folder_setup
|
- shared_folder_setup
|
||||||
- if running_vboxguest || running_vboxadd; then
|
- if running_vboxguest || running_vboxadd; then
|
||||||
- begin "Running kernel modules will not be replaced until the system is restarted"
|
- info "Running kernel modules will not be replaced until the system is restarted"
|
||||||
- fi
|
- fi
|
||||||
- return 0
|
- return 0
|
||||||
+ begin "Recompiling VirtualBox kernel module, NOT. It has been packaged."
|
+ begin "Recompiling VirtualBox kernel module, NOT. It has been packaged."
|
||||||
@ -182,11 +182,11 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
depmod
|
depmod
|
||||||
|
|
||||||
# Remove old module sources
|
# Remove old module sources
|
||||||
@@ -479,13 +440,14 @@ cleanup()
|
@@ -488,13 +455,14 @@ cleanup()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Clean-up X11-related bits
|
# Clean-up X11-related bits
|
||||||
- ${INSTALL_DIR}/init/vboxadd-x11 cleanup
|
- "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}"
|
||||||
+ #/sbin/rcvboxadd-x11 cleanup
|
+ #/sbin/rcvboxadd-x11 cleanup
|
||||||
|
|
||||||
# Remove other files
|
# Remove other files
|
||||||
@ -201,23 +201,23 @@ Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd.sh
|
|||||||
fi
|
fi
|
||||||
rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
|
rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null
|
||||||
}
|
}
|
||||||
Index: VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
Index: VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.24.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||||
+++ VirtualBox-5.1.24/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
+++ VirtualBox-5.2.0/src/VBox/Additions/linux/installer/vboxadd-service.sh
|
||||||
@@ -20,7 +20,7 @@
|
@@ -23,7 +23,7 @@
|
||||||
# Provides: vboxadd-service
|
# Provides: vboxadd-service
|
||||||
# Required-Start: vboxadd
|
# Required-Start: vboxadd
|
||||||
# Required-Stop: vboxadd
|
# Required-Stop: vboxadd
|
||||||
-# Default-Start: 2 3 4 5
|
-# Default-Start: 2 3 4 5
|
||||||
+# Default-Start: 2 3 5
|
+# Default-Start: 2 3 5
|
||||||
# Default-Stop: 0 1 6
|
# Default-Stop: 0 1 6
|
||||||
|
# X-Conflicts-With: systemd-timesyncd.service
|
||||||
# Description: VirtualBox Additions Service
|
# Description: VirtualBox Additions Service
|
||||||
### END INIT INFO
|
Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||||
Index: VirtualBox-5.1.24/src/VBox/Installer/linux/vboxautostart-service.sh
|
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.24.orig/src/VBox/Installer/linux/vboxautostart-service.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||||
+++ VirtualBox-5.1.24/src/VBox/Installer/linux/vboxautostart-service.sh
|
+++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxautostart-service.sh
|
||||||
@@ -20,7 +20,7 @@
|
@@ -20,7 +20,7 @@
|
||||||
# Provides: vboxautostart-service
|
# Provides: vboxautostart-service
|
||||||
# Required-Start: vboxdrv
|
# Required-Start: vboxdrv
|
||||||
@ -227,10 +227,10 @@ Index: VirtualBox-5.1.24/src/VBox/Installer/linux/vboxautostart-service.sh
|
|||||||
# Default-Stop: 0 1 6
|
# Default-Stop: 0 1 6
|
||||||
# Description: VirtualBox autostart service
|
# Description: VirtualBox autostart service
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
Index: VirtualBox-5.1.24/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.24.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||||
+++ VirtualBox-5.1.24/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
+++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
||||||
@@ -20,7 +20,7 @@
|
@@ -20,7 +20,7 @@
|
||||||
# Provides: vboxballoonctrl-service
|
# Provides: vboxballoonctrl-service
|
||||||
# Required-Start: vboxdrv
|
# Required-Start: vboxdrv
|
||||||
@ -240,10 +240,10 @@ Index: VirtualBox-5.1.24/src/VBox/Installer/linux/vboxballoonctrl-service.sh
|
|||||||
# Default-Stop: 0 1 6
|
# Default-Stop: 0 1 6
|
||||||
# Description: VirtualBox watchdog daemon
|
# Description: VirtualBox watchdog daemon
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
Index: VirtualBox-5.1.24/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
Index: VirtualBox-5.2.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.24.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||||
+++ VirtualBox-5.1.24/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
+++ VirtualBox-5.2.0/src/VBox/ValidationKit/testboxscript/linux/testboxscript-service.sh
|
||||||
@@ -31,7 +31,7 @@
|
@@ -31,7 +31,7 @@
|
||||||
# Provides: testboxscript-service
|
# Provides: testboxscript-service
|
||||||
# Required-Start: $network
|
# Required-Start: $network
|
||||||
@ -253,10 +253,10 @@ Index: VirtualBox-5.1.24/src/VBox/ValidationKit/testboxscript/linux/testboxscrip
|
|||||||
# Default-Stop: 0 1 6
|
# Default-Stop: 0 1 6
|
||||||
# Description: TestBoxScript service
|
# Description: TestBoxScript service
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
Index: VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
Index: VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.24.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||||
+++ VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
+++ VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs-nat.sh
|
||||||
@@ -31,7 +31,7 @@
|
@@ -31,7 +31,7 @@
|
||||||
# Provides: vboxtxs
|
# Provides: vboxtxs
|
||||||
# Required-Start: $network
|
# Required-Start: $network
|
||||||
@ -266,10 +266,10 @@ Index: VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs
|
|||||||
# Default-Stop: 0 1 6
|
# Default-Stop: 0 1 6
|
||||||
# Description: VirtualBox Test Execution Service
|
# Description: VirtualBox Test Execution Service
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
Index: VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
Index: VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.24.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||||
+++ VirtualBox-5.1.24/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
+++ VirtualBox-5.2.0/src/VBox/ValidationKit/utils/TestExecServ/linux/vboxtxs.sh
|
||||||
@@ -31,7 +31,7 @@
|
@@ -31,7 +31,7 @@
|
||||||
# Provides: vboxtxs
|
# Provides: vboxtxs
|
||||||
# Required-Start: $network
|
# Required-Start: $network
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh
|
Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxdrv.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.16.orig/src/VBox/Installer/linux/vboxdrv.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxdrv.sh
|
||||||
+++ VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh
|
+++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxdrv.sh
|
||||||
@@ -19,11 +19,12 @@
|
@@ -19,11 +19,12 @@
|
||||||
#
|
#
|
||||||
### BEGIN INIT INFO
|
### BEGIN INIT INFO
|
||||||
@ -33,7 +33,7 @@ Index: VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh
|
|||||||
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
|
if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then
|
||||||
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
|
failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
|
||||||
fi
|
fi
|
||||||
@@ -387,35 +381,8 @@ cleanup()
|
@@ -396,35 +390,8 @@ cleanup()
|
||||||
# setup_script
|
# setup_script
|
||||||
setup()
|
setup()
|
||||||
{
|
{
|
||||||
@ -42,7 +42,7 @@ Index: VirtualBox-5.1.16/src/VBox/Installer/linux/vboxdrv.sh
|
|||||||
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
|
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
|
||||||
- --module-source "$MODULE_SRC/vboxdrv" \
|
- --module-source "$MODULE_SRC/vboxdrv" \
|
||||||
- --no-print-directory install >> $LOG 2>&1; then
|
- --no-print-directory install >> $LOG 2>&1; then
|
||||||
- "${INSTALL_DIR}/check_module_dependencies.sh"
|
- "${INSTALL_DIR}/check_module_dependencies.sh" || exit 1
|
||||||
- failure "Look at $LOG to find out what went wrong"
|
- failure "Look at $LOG to find out what went wrong"
|
||||||
- fi
|
- fi
|
||||||
- if ! $BUILDINTMP \
|
- if ! $BUILDINTMP \
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Index: VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh
|
Index: VirtualBox-5.2.0/src/VBox/Installer/linux/vboxweb-service.sh
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.2.orig/src/VBox/Installer/linux/vboxweb-service.sh
|
--- VirtualBox-5.2.0.orig/src/VBox/Installer/linux/vboxweb-service.sh
|
||||||
+++ VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh
|
+++ VirtualBox-5.2.0/src/VBox/Installer/linux/vboxweb-service.sh
|
||||||
@@ -20,7 +20,7 @@
|
@@ -20,7 +20,7 @@
|
||||||
# Provides: vboxweb-service
|
# Provides: vboxweb-service
|
||||||
# Required-Start: vboxdrv
|
# Required-Start: vboxdrv
|
||||||
@ -11,3 +11,4 @@ Index: VirtualBox-5.1.2/src/VBox/Installer/linux/vboxweb-service.sh
|
|||||||
# Default-Stop: 0 1 6
|
# Default-Stop: 0 1 6
|
||||||
# Description: VirtualBox web service API
|
# Description: VirtualBox web service API
|
||||||
### END INIT INFO
|
### END INIT INFO
|
||||||
|
|
||||||
|
@ -25,10 +25,8 @@ fi
|
|||||||
#
|
#
|
||||||
# Check if virtualbox-guest-source version matches virtualbox version
|
# Check if virtualbox-guest-source version matches virtualbox version
|
||||||
if [ "$(rpm -q virtualbox virtualbox-guest-source --queryformat='%{version}-%{release}\n' 2>/dev/null | sort -u | wc -l)" -ne "1" ] ; then
|
if [ "$(rpm -q virtualbox virtualbox-guest-source --queryformat='%{version}-%{release}\n' 2>/dev/null | sort -u | wc -l)" -ne "1" ] ; then
|
||||||
echo "virtualbox-guest-source package version doesn't match"
|
echo "virtualbox-host-source package version doesn't match the version of virtualbox package."
|
||||||
echo "the version of virtualbox package."
|
echo "This situation is probably not fatal, thus we will try to continue .."
|
||||||
echo "Reinstall virtualbox-guest-source package. Quitting .."
|
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
# Prerequisites are available, start build
|
# Prerequisites are available, start build
|
||||||
pushd $SOURCE > /dev/null 2>&1
|
pushd $SOURCE > /dev/null 2>&1
|
||||||
|
@ -2,5 +2,4 @@
|
|||||||
%dir /lib/modules/%2-%1/
|
%dir /lib/modules/%2-%1/
|
||||||
%dir /lib/modules/%2-%1/extra
|
%dir /lib/modules/%2-%1/extra
|
||||||
/lib/modules/%2-%1/extra/vboxsf.ko
|
/lib/modules/%2-%1/extra/vboxsf.ko
|
||||||
/lib/modules/%2-%1/extra/vboxvideo.ko
|
|
||||||
/lib/modules/%2-%1/extra/vboxguest.ko
|
/lib/modules/%2-%1/extra/vboxguest.ko
|
||||||
|
@ -1,21 +1,21 @@
|
|||||||
Index: VirtualBox-5.1.2/src/VBox/Main/Makefile.kmk
|
Index: VirtualBox-5.2.0/src/VBox/Main/Makefile.kmk
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.2.orig/src/VBox/Main/Makefile.kmk
|
--- VirtualBox-5.2.0.orig/src/VBox/Main/Makefile.kmk
|
||||||
+++ VirtualBox-5.1.2/src/VBox/Main/Makefile.kmk
|
+++ VirtualBox-5.2.0/src/VBox/Main/Makefile.kmk
|
||||||
@@ -1331,7 +1331,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
|
@@ -1521,7 +1521,7 @@ $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d.ts \
|
||||||
$(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
|
$(QUIET)$(VBOX_XSLTPROC) --stringparam KBUILD_HOST $(KBUILD_HOST) \
|
||||||
--stringparam generating "dtrace-probes" \
|
--stringparam generating "dtrace-probes" \
|
||||||
-o "$@" $(VBoxAPIWrap_VBOX_XSLT) $<
|
-o "$@" $(VBoxAPIWrap_VBOX_XSLT) $(VBOX_XIDL_FILE)
|
||||||
- $(QUIET)$(SED) -e '' -o "$@.tmp" \
|
- $(QUIET)$(SED) -e '' -o "$@.tmp" \
|
||||||
+ $(QUIET)$(SED) -e '' --output "$@.tmp" \
|
+ $(QUIET)$(SED) -e '' --output "$@.tmp" \
|
||||||
"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start.d" \
|
"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-start.d" \
|
||||||
"$@" \
|
"$@" \
|
||||||
"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end.d"
|
"$(VBOX_PATH_MAIN_SRC)/src-all/VBoxAPI-end.d"
|
||||||
Index: VirtualBox-5.0.24/src/VBox/Devices/Makefile.kmk
|
Index: VirtualBox-5.2.0/src/VBox/Devices/Makefile.kmk
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.0.24.orig/src/VBox/Devices/Makefile.kmk
|
--- VirtualBox-5.2.0.orig/src/VBox/Devices/Makefile.kmk
|
||||||
+++ VirtualBox-5.0.24/src/VBox/Devices/Makefile.kmk
|
+++ VirtualBox-5.2.0/src/VBox/Devices/Makefile.kmk
|
||||||
@@ -818,8 +818,7 @@ if !defined(VBOX_ONLY_EXTPACKS)
|
@@ -892,8 +892,7 @@ if !defined(VBOX_ONLY_EXTPACKS)
|
||||||
$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
|
$(call MSG_TOOL,iasl,VBoxDD,$<,$@)
|
||||||
$(QUIET)$(RM) -f $@ $@.tmp $@.pre
|
$(QUIET)$(RM) -f $@ $@.tmp $@.pre
|
||||||
$(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $<
|
$(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -x c -o $@.pre $<
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
Index: VirtualBox-5.2.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
||||||
+++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
+++ VirtualBox-5.2.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
||||||
@@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
|
@@ -69,18 +69,13 @@ VBoxOGL_INCS = . $(VBOX_GRAPHI
|
||||||
VBoxOGL_INCS = .
|
|
||||||
if1of ($(KBUILD_TARGET), linux solaris freebsd)
|
if1of ($(KBUILD_TARGET), linux solaris freebsd)
|
||||||
|
ifndef VBOX_USE_SYSTEM_GL_HEADERS
|
||||||
VBoxOGL_INCS += \
|
VBoxOGL_INCS += \
|
||||||
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
|
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
|
||||||
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
|
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
|
||||||
@ -16,19 +16,21 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
|||||||
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
|
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
|
||||||
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
|
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
|
||||||
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
|
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
|
||||||
|
- $(VBOX_GL_INCS)
|
||||||
|
- endif
|
||||||
+ /usr/include/x11 \
|
+ /usr/include/x11 \
|
||||||
+ /usr/include/xorg \
|
+ /usr/include/xorg \
|
||||||
+ /usr/include/pixman-1 \
|
+ /usr/include/pixman-1 \
|
||||||
$(VBOX_MESA_INCS) \
|
+ $(VBOX_MESA_INCS) \
|
||||||
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
|
|
||||||
+ /usr/include/drm \
|
+ /usr/include/drm \
|
||||||
+ /usr/include/libdrm
|
+ /usr/include/libdrm
|
||||||
|
+ endif
|
||||||
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
|
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -214,10 +208,10 @@ VBoxOGL_LIBS.win += \
|
@@ -219,10 +214,10 @@ if1of ($(KBUILD_TARGET), linux solaris f
|
||||||
|
VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext
|
||||||
if1of ($(KBUILD_TARGET), linux solaris freebsd)
|
else
|
||||||
VBoxOGL_LIBS += \
|
VBoxOGL_LIBS += \
|
||||||
- $(PATH_STAGE_LIB)/libXcomposite.so \
|
- $(PATH_STAGE_LIB)/libXcomposite.so \
|
||||||
- $(PATH_STAGE_LIB)/libXdamage.so \
|
- $(PATH_STAGE_LIB)/libXdamage.so \
|
||||||
@ -38,19 +40,18 @@ Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
|||||||
+ Xdamage \
|
+ Xdamage \
|
||||||
+ Xfixes \
|
+ Xfixes \
|
||||||
+ Xext
|
+ Xext
|
||||||
|
endif
|
||||||
ifdef VBoxOGL_FAKEDRI
|
ifdef VBoxOGL_FAKEDRI
|
||||||
ifeq ($(KBUILD_TARGET), freebsd)
|
ifeq ($(KBUILD_TARGET), freebsd)
|
||||||
VBoxOGL_LIBS += \
|
Index: VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/getmode.c
|
||||||
Index: VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
|
|
||||||
===================================================================
|
===================================================================
|
||||||
--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
|
--- VirtualBox-5.2.0.orig/src/VBox/Additions/x11/vboxvideo/getmode.c
|
||||||
+++ VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
|
+++ VirtualBox-5.2.0/src/VBox/Additions/x11/vboxvideo/getmode.c
|
||||||
@@ -40,8 +40,6 @@ LIBRARIES += \
|
@@ -26,6 +26,7 @@
|
||||||
VBoxGuestR3LibShared
|
*/
|
||||||
ifndef VBOX_ONLY_VALIDATIONKIT
|
|
||||||
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
|
#include "vboxvideo.h"
|
||||||
- LIBRARIES += \
|
+#include "VBoxVideoGuest.h"
|
||||||
- VBoxGuestR3LibXFree86
|
|
||||||
endif
|
#define NEED_XF86_TYPES
|
||||||
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
|
#include "xf86.h"
|
||||||
LIBRARIES += \
|
|
||||||
|
@ -1,3 +1,81 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 29 19:19:22 UTC 2017 - Larry.Finger@lwfinger.net
|
||||||
|
|
||||||
|
- File "fixes_for_4.14.patch" deleted - upstream fix.
|
||||||
|
File "remove_vbox_video_build.patch" added as current versions of Xorg no longer need this component.
|
||||||
|
|
||||||
|
Version update to 5.2.4 (released 2017-12-19 by Oracle)
|
||||||
|
|
||||||
|
This is a maintenance release. The following items were fixed and/or added:
|
||||||
|
|
||||||
|
User interface: Adjusting desktop file for X11 window managers (bug #17312)
|
||||||
|
User interface: various high resolution display adjustments
|
||||||
|
Audio: fixed SB16 volume handling (5.2 regression)
|
||||||
|
Audio: various fixes
|
||||||
|
USB/OHCI: fixed a problem where OHCI emulation might sporadically drop data transfers
|
||||||
|
Linux hosts: fixed screen corruption when the host screen changes and a virtual machine window is maximized
|
||||||
|
X11 Guest Additions: fixed a hang at the GNOME Shell login screen with 3D enabled (5.2 regression, bugs #17189 and #17190)
|
||||||
|
|
||||||
|
Version bump to 5.2.2 (released 2017-11-24 by Oracle)
|
||||||
|
|
||||||
|
This is a maintenance release. The following items were fixed and/or added:
|
||||||
|
|
||||||
|
User interface: various improvements for high resolution screens
|
||||||
|
User interface: added functionality to duplicate optical and floppy images
|
||||||
|
User interface: various improvements for the virtual media manager
|
||||||
|
VMM: fixed emulation so that Plan 9 guests can start once more (5.1.0 regression)
|
||||||
|
Storage: fixed regression breaking iSCSI (bug #17196)
|
||||||
|
Audio: added HDA support for more exotic guests (e.g. Haiku)
|
||||||
|
Serial: fixed hanging I/O when using named pipes on Windows (5.2.0 regression; bug #17227)
|
||||||
|
Serial: fixed broken communication with certain devices on Linux hosts
|
||||||
|
USB/OHCI: improved behavior so that the controller state after a VM reset is closer to the initial state after VM start
|
||||||
|
EFI: fixed HFS+ driver which in rare cases failed to access most files on a volume
|
||||||
|
Shared clipboard: fixed hang with OS X host and Linux guest (bug #15782)
|
||||||
|
Linux hosts: fixed kernel module compilation and start failures with Linux kernel 4.14 (bug #17267)
|
||||||
|
X11 hosts: better handle WM_CLASS setting (bug #12534)
|
||||||
|
Linux guests: fixed kernel module compilation and other problems with Linux kernel 4.14 (bug #12534)
|
||||||
|
Linux guests: fixed kernel module compilation and other problems with Linux kernel 4.14
|
||||||
|
Linux guests: fixed various 5.2.0 regressions (bug #17163)
|
||||||
|
Bridged networking: fixed duplicate EtherType in VLAN/priority tags on Linux (5.2.0 regression; bug #17277)
|
||||||
|
|
||||||
|
Version change to 5.2.0 (released 2017-10-18 by Oracle)
|
||||||
|
|
||||||
|
This is a major update. The following major new features were added:
|
||||||
|
|
||||||
|
VM export to Oracle Cloud (OPC)
|
||||||
|
Unattended guest installation (bug #5810; see the manual for more information)
|
||||||
|
Overhauled VM selector GUI (improved tools VM / global tools handling, new icons)
|
||||||
|
Added experimental audio support for video recording
|
||||||
|
|
||||||
|
In addition, the following items were fixed and/or added:
|
||||||
|
|
||||||
|
VMM: fixed reason for recent Linux kernels on also recent CPU models warning about "XSAVE consistency problem"
|
||||||
|
GUI: Virtual Media Manager rework allowing to manage media attributes, like size, location, type and description
|
||||||
|
GUI: Host-only Network Manager implemented to simplify managing corresponding networks and their attributes
|
||||||
|
GUI: Snapshot Pane rework allowing to manage snapshot attributes, like name and description; reworked snapshot details which looks more clear, corresponds to VM Details pane and reflects current VM state difference according to last snapshot taken
|
||||||
|
GUI: Audio settings extended with possibility to enable/disable audio input/output; corresponding changed were done to Audio and Video Capture settings pages; VM Devices menu and status-bar extended with corresponding actions and indicator as well
|
||||||
|
GUI: improvements with accessibility support
|
||||||
|
GUI: Fixed double mouse cursor when using mouse integration without Guest Additions, actually a Qt 5.6 bug fixed with QT 5.6.3 (Mac OS X hosts only; bug #15610)
|
||||||
|
Audio: implemented (optional) device enumeration support for audio backends
|
||||||
|
Audio: implemented support for host device callbacks (e.g. when adding or removing an audio device)
|
||||||
|
Audio: HDA emulation now uses asynchronous data processing in separate threads
|
||||||
|
Audio: implemented ability to enable or disable audio input / output on-the-fly
|
||||||
|
Storage: implemented support for CUE/BIN images as CD/DVD media including multiple tracks
|
||||||
|
Storage: implemented support for the controller memory buffer feature for NVMe
|
||||||
|
Storage: first milestone of the I/O stack redesign landed
|
||||||
|
E1000: Fix for Windows XP freeze when booting with unplugged cable
|
||||||
|
NAT network: do not skip some port forwarding setup when multiple VMs are active (Windows hosts only; bug #17041)
|
||||||
|
Serial: fixed extremely rare misbehavior on VM poweroff
|
||||||
|
EFI: better video mode handling, supporting custom video modes and easier configuration (bug #6783)
|
||||||
|
BIOS: properly report floppy logical sectors per track for unusual formats
|
||||||
|
BIOS: update ATA disk parameter table vectors only if there is actually a corresponding ATA disk attached
|
||||||
|
PXE: speed up booting by better handling pending packets when the link is not up yet
|
||||||
|
VBoxManage: handle CPUID sub-leaf overrides better
|
||||||
|
Windows Additions: fix several 3D related crashes
|
||||||
|
Solaris hosts: allow increasing MTU size for host-only adapter to 9706 bytes to support jumbo frames
|
||||||
|
Linux Additions: on systems using systemd, make sure that only the Guest Additions timesync service is active
|
||||||
|
many unlisted fixes and improvements
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Dec 11 14:02:07 UTC 2017 - hschmidt@suse.com
|
Mon Dec 11 14:02:07 UTC 2017 - hschmidt@suse.com
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
%define _vbox_instdir %{_libexecdir}/virtualbox
|
%define _vbox_instdir %{_libexecdir}/virtualbox
|
||||||
%define _udevrulesdir %{_sysconfdir}/udev/rules.d
|
%define _udevrulesdir %{_sysconfdir}/udev/rules.d
|
||||||
Name: virtualbox
|
Name: virtualbox
|
||||||
Version: 5.1.30
|
Version: 5.2.4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: VirtualBox is an Emulator
|
Summary: VirtualBox is an Emulator
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
@ -102,8 +102,6 @@ Patch109: vbox-usb-warning.diff
|
|||||||
Patch112: modify_for_4_8_bo_move.patch
|
Patch112: modify_for_4_8_bo_move.patch
|
||||||
# Remove all mention of _smp_mflags
|
# Remove all mention of _smp_mflags
|
||||||
Patch113: vbox_remove_smp_mflags.patch
|
Patch113: vbox_remove_smp_mflags.patch
|
||||||
# Fix for removal of vfs_write() in kernel 4.14
|
|
||||||
Patch114: fixes_for_4.14.patch
|
|
||||||
# Allow use of gcc7
|
# Allow use of gcc7
|
||||||
Patch115: vbox_fix_for_gcc7.patch
|
Patch115: vbox_fix_for_gcc7.patch
|
||||||
# Fix for missing include needed for server 1.19
|
# Fix for missing include needed for server 1.19
|
||||||
@ -116,6 +114,8 @@ Patch118: internal-headers.patch
|
|||||||
Patch119: fixes_for_leap15.patch
|
Patch119: fixes_for_leap15.patch
|
||||||
# Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py
|
# Fix rpmlint error for script /lib/usr/virtualbox/vboxshell.py
|
||||||
Patch120: fixes_for_python.patch
|
Patch120: fixes_for_python.patch
|
||||||
|
# Remove vboxvideo from build
|
||||||
|
Patch121: remove_vbox_video_build.patch
|
||||||
#
|
#
|
||||||
BuildRequires: LibVNCServer-devel
|
BuildRequires: LibVNCServer-devel
|
||||||
BuildRequires: SDL-devel
|
BuildRequires: SDL-devel
|
||||||
@ -140,7 +140,7 @@ BuildRequires: gcc-c++
|
|||||||
BuildRequires: glibc-devel-static
|
BuildRequires: glibc-devel-static
|
||||||
BuildRequires: gsoap-devel
|
BuildRequires: gsoap-devel
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
BuildRequires: kbuild >= 0.1.9998svn2808
|
BuildRequires: kbuild >= 0.1.9998svn3101
|
||||||
#BuildRequires: kernel-syms
|
#BuildRequires: kernel-syms
|
||||||
BuildRequires: libcap-devel
|
BuildRequires: libcap-devel
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
@ -388,7 +388,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
|
|||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
%patch99 -p1
|
%patch99 -p1
|
||||||
%patch100
|
%patch100 -p1
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%patch103 -p1
|
%patch103 -p1
|
||||||
%patch104 -p1
|
%patch104 -p1
|
||||||
@ -399,15 +399,15 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL.
|
|||||||
%patch109 -p1
|
%patch109 -p1
|
||||||
%patch112 -p1
|
%patch112 -p1
|
||||||
%patch113 -p1
|
%patch113 -p1
|
||||||
%patch114 -p1
|
|
||||||
%patch115 -p1
|
%patch115 -p1
|
||||||
%patch116 -p1
|
%patch116 -p1
|
||||||
%patch117 -p1
|
%patch117 -p1
|
||||||
%patch118 -p1
|
%patch118 -p1
|
||||||
%if 0%{suse_version} >= 1500
|
%if 0%{suse_version} == 1500
|
||||||
%patch119 -p1
|
%patch119 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch120 -p1
|
%patch120 -p1
|
||||||
|
%patch121 -p1
|
||||||
|
|
||||||
#copy user manual
|
#copy user manual
|
||||||
cp %{SOURCE1} UserManual.pdf
|
cp %{SOURCE1} UserManual.pdf
|
||||||
@ -482,10 +482,10 @@ install -D -m 644 "COPYING" "%{buildroot}%{_datadir}/licenses/LICENSE.vnc"
|
|||||||
#
|
#
|
||||||
# build kernel modules for guest and host (check novel-kmp package as example)
|
# build kernel modules for guest and host (check novel-kmp package as example)
|
||||||
# host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci
|
# host modules : vboxdrv,vboxnetflt,vboxnetadp,vboxpci
|
||||||
# guest modules : vboxguest,vboxsf,vboxvideo
|
# guest modules : vboxguest,vboxsf
|
||||||
echo "build kernel modules"
|
echo "build kernel modules"
|
||||||
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
|
for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
|
||||||
out/linux.*/release/bin/additions/src/vbox{guest,sf,video}; do
|
out/linux.*/release/bin/additions/src/vbox{guest,sf}; do
|
||||||
#get the module name from path
|
#get the module name from path
|
||||||
module_name=$(basename "$vbox_module")
|
module_name=$(basename "$vbox_module")
|
||||||
|
|
||||||
@ -513,10 +513,10 @@ for vbox_module in out/linux.*/release/bin/src/vbox{drv,netflt,netadp,pci} \
|
|||||||
$PWD/modules_build_dir/$flavor/$module_name
|
$PWD/modules_build_dir/$flavor/$module_name
|
||||||
fi
|
fi
|
||||||
# copy vboxguest (for guest) module symbols which are used by vboxvideo km:
|
# copy vboxguest (for guest) module symbols which are used by vboxvideo km:
|
||||||
if [ "$module_name" = "vboxvideo" ]; then
|
# if [ "$module_name" = "vboxvideo" ]; then
|
||||||
cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \
|
# cp $PWD/modules_build_dir/$flavor/vboxguest/Module.symvers \
|
||||||
$PWD/modules_build_dir/$flavor/$module_name
|
# $PWD/modules_build_dir/$flavor/$module_name
|
||||||
fi
|
# fi
|
||||||
# build the module for the specific flavor
|
# build the module for the specific flavor
|
||||||
make -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \
|
make -j2 -C %{_prefix}/src/linux-obj/%{_target_cpu}/$flavor modules \
|
||||||
M=$PWD/modules_build_dir/$flavor/$module_name
|
M=$PWD/modules_build_dir/$flavor/$module_name
|
||||||
@ -555,7 +555,7 @@ export INSTALL_MOD_DIR=extra
|
|||||||
export INITRD_IN_POSTTRANS=1
|
export INITRD_IN_POSTTRANS=1
|
||||||
export KMP_NEEDS_MKINITRD=0
|
export KMP_NEEDS_MKINITRD=0
|
||||||
#to install modules we use here similar steps like in build phase, go through all the modules :
|
#to install modules we use here similar steps like in build phase, go through all the modules :
|
||||||
for module_name in vbox{drv,netflt,pci,netadp,guest,sf,video}
|
for module_name in vbox{drv,netflt,pci,netadp,guest,sf}
|
||||||
do
|
do
|
||||||
#and through the all flavors
|
#and through the all flavors
|
||||||
for flavor in %{flavors_to_build}; do
|
for flavor in %{flavors_to_build}; do
|
||||||
@ -585,7 +585,7 @@ pushd out/linux.*/release/bin/additions/
|
|||||||
#VBoxClient daemon (support for clipboard,autoresize,seamless windows)
|
#VBoxClient daemon (support for clipboard,autoresize,seamless windows)
|
||||||
install -m 755 VBoxClient %{buildroot}%{_bindir}
|
install -m 755 VBoxClient %{buildroot}%{_bindir}
|
||||||
# xorg drivers for video
|
# xorg drivers for video
|
||||||
install -m 755 vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
#install -m 755 vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
||||||
popd
|
popd
|
||||||
# VBoxOGL* libs for guest-x11 subpackage
|
# VBoxOGL* libs for guest-x11 subpackage
|
||||||
install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
|
install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
|
||||||
@ -594,7 +594,7 @@ install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \
|
|||||||
install -m 755 out/linux.*/release/bin/additions/VBoxEGL*.so \
|
install -m 755 out/linux.*/release/bin/additions/VBoxEGL*.so \
|
||||||
%{buildroot}%{_libdir}
|
%{buildroot}%{_libdir}
|
||||||
# make link for dri lib
|
# make link for dri lib
|
||||||
ln -s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
|
#ln -s %{_libdir}/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so
|
||||||
# install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
|
# install init script which start VBoxClient daemon (support for clipboard,autoresize,seamless windows)
|
||||||
install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
|
install -m 755 src/VBox/Additions/x11/Installer/98vboxadd-xclient %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
|
||||||
|
|
||||||
@ -945,8 +945,8 @@ export DISABLE_RESTART_ON_UPDATE=yes
|
|||||||
%{_bindir}/VBoxClient
|
%{_bindir}/VBoxClient
|
||||||
%{_libdir}/VBoxOGL*.so
|
%{_libdir}/VBoxOGL*.so
|
||||||
%{_libdir}/VBoxEGL*.so
|
%{_libdir}/VBoxEGL*.so
|
||||||
%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
#%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
|
||||||
%{_libdir}/dri/vboxvideo_dri.so
|
#%{_libdir}/dri/vboxvideo_dri.so
|
||||||
%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
|
%{_sysconfdir}/X11/xinit/xinitrc.d/vboxadd-xclient.sh
|
||||||
|
|
||||||
%files guest-tools
|
%files guest-tools
|
||||||
|
Loading…
Reference in New Issue
Block a user