virtualbox-ose: update to 6.0.6.

[skip ci]
This commit is contained in:
Helmut Pozimski 2019-05-08 11:25:13 +02:00
parent 0e71aff1c9
commit 182bc30127
2 changed files with 4 additions and 80 deletions

View file

@ -1,77 +0,0 @@
--- src/VBox/HostDrivers/Support/linux/Makefile
+++ src/VBox/HostDrivers/Support/linux/Makefile
@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE
MOD_OBJS += SUPDrvDTrace.o
endif
-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxdrv,/ /include /r0drv/linux)
ifdef VBOX_WITH_NATIVE_DTRACE
MOD_INCL += -I/usr/include/linux -I/usr/include
endif
@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK
endif
# build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \
+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxdrv/include/VBox/SUPDrvMangling.h \
-fno-omit-frame-pointer -fno-pie
include $(obj)/Makefile.include.footer
--- src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+++ src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \
math/gcc/umoddi3.o
endif
-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetadp,/ /include /r0drv/linux)
MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
-DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
-Wno-declaration-after-statement
@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE
endif
# build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie
include $(obj)/Makefile.include.footer
--- src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+++ src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
math/gcc/umoddi3.o
endif
-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetflt,/ /include /r0drv/linux)
MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
-DIN_SUP_R0 -DVBOX -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
-Wno-declaration-after-statement
@@ -63,6 +63,6 @@ ifdef VBOX_USE_INSERT_PAGE
endif
# build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxnetflt/include/VBox/SUPDrvMangling.h -fno-pie
include $(obj)/Makefile.include.footer
--- src/VBox/HostDrivers/VBoxPci/linux/Makefile
+++ src/VBox/HostDrivers/VBoxPci/linux/Makefile
@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
math/gcc/umoddi3.o
endif
-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
+MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxpci,/ /include /r0drv/linux)
MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
-DRT_WITH_VBOX -DVBOX_WITH_HARDENING
ifeq ($(BUILD_TARGET_ARCH),amd64)
@@ -60,6 +60,6 @@ ifdef VBOX_USE_INSERT_PAGE
endif
# build defs
-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
+MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxpci/include/VBox/SUPDrvMangling.h -fno-pie
include $(obj)/Makefile.include.footer

View file

@ -1,7 +1,7 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
version=6.0.4
revision=2
version=6.0.6
revision=1
wrksrc="VirtualBox-${version%*a}"
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Juan RP <xtraeme@voidlinux.org>"
@ -9,7 +9,7 @@ license="GPL-2.0-only, CDDL-1.0"
homepage="https://www.virtualbox.org"
changelog="https://www.virtualbox.org/wiki/Changelog"
distfiles="http://download.virtualbox.org/virtualbox/${version%*a}/VirtualBox-$version.tar.bz2"
checksum=f80b0c68182c946fb74ada8034960c38159ad91085b153da1277e4f191af6e1f
checksum=3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552
nopie=yes
lib32disabled=yes
@ -131,6 +131,7 @@ virtualbox-ose-dkms_package() {
install -d ${_osedir}
cp -a . ${_osedir}
cp -a ${wrksrc}/include ${_osedir}
rm -f ${_osedir}/do_dkms
install -m644 ${FILESDIR}/${sourcepkg}-dkms.dkms ${_osedir}/dkms.conf
vinstall ${FILESDIR}/${sourcepkg}-dkms.udev 644 \