Merge pull request #6899 from Rmys/master

virtualbox:ver.bump
2019-05-28 18:35:04 +03:00
parent ed71459fc9 e4261604be
commit 370b75e8a8
2 changed files with 53 additions and 1 deletions
@@ -0,0 +1,44 @@
+diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
+index 18466b48..7c7de4e5 100644
+--- a/src/VBox/HostDrivers/linux/Makefile
+++ b/src/VBox/HostDrivers/linux/Makefile
+@@ -23,25 +23,25 @@
+ # terms and conditions of either the GPL or the CDDL or both.
+ #
+ 
+-ifneq ($(KERNELRELEASE),)
+ifneq ($(KBUILD_EXTMOD),)
+ 
+-# Building from kBuild (make -C <kernel_directory> M=`pwd`),
+-# or inside a kernel source tree.
+# Building from kBuild (make -C <kernel_directory> M=`pwd`).
+# KBUILD_EXTMOD is set to $(M) in this case.
+ 
+ obj-m = vboxdrv/
+-ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
+  obj-m += vboxnetflt/
+ endif
+-ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
+  obj-m += vboxnetadp/
+ endif
+-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
+  obj-m += vboxpci/
+ endif
+ 
+-else # ! KERNELRELEASE
+else # ! KBUILD_EXTMOD
+ 
+-# convenience Makefile without KERNELRELEASE
+# convenience Makefile without KBUILD_EXTMOD
+ 
+ KBUILD_VERBOSE ?=
+ KERN_VER ?= $(shell uname -r)
+@@ -146,4 +146,4 @@ load: unload
+ 		fi; \
+ 	done
+ 
+-endif # ! KERNELRELEASE
+endif # ! KBUILD_EXTMOD
@@ -12,7 +12,7 @@
        <IsA>app:gui</IsA>
        <Summary>A powerful virtualization program</Summary>
        <Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
-        <Archive sha1sum="1357b28da0a71cf0da66efe95822bdabc401d6e6" type="tarbz2">http://download.virtualbox.org/virtualbox/6.0.6/VirtualBox-6.0.6.tar.bz2</Archive>
+        <Archive sha1sum="f119eee3c7c57af6c283426dcfaf47db456532ba" type="tarbz2">http://download.virtualbox.org/virtualbox/6.0.8/VirtualBox-6.0.8.tar.bz2</Archive>
        <BuildDependencies>
            <Dependency>dev86</Dependency>
            <Dependency>cdrkit</Dependency>
@@ -66,6 +66,7 @@
            <Patch level="1">012-vboxsf-automount.patch</Patch>
            <Patch level="1">001_virtualbox-5.0.16-mesa-check.patch</Patch> -->
            <Patch level="1">009-virtualbox-5.1.0-add_missing_gl_header.patch</Patch>
+            <Patch level="1">013-Makefile.patch</Patch>
        </Patches>
    </Source>

@@ -155,6 +156,13 @@
    </Package>

    <History>
+        <Update release="24">
+            <Date>2019-05-17</Date>
+            <Version>6.0.8</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
        <Update release="23">
            <Date>2019-04-19</Date>
            <Version>6.0.6</Version>