diff options
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | 002-dri-driver-path.patch | 18 | ||||
| -rw-r--r-- | 003-ogl-include-path.patch | 35 | ||||
| -rw-r--r-- | 009-include-path.patch | 85 | ||||
| -rw-r--r-- | PKGBUILD | 45 | ||||
| -rw-r--r-- | virtualbox-guest-dkms.conf | 6 | ||||
| -rw-r--r-- | virtualbox-host-dkms.conf | 8 |
7 files changed, 123 insertions, 97 deletions
@@ -1,10 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Sep 16 02:41:49 UTC 2017 +# Fri Jan 26 20:21:45 UTC 2018 pkgbase = virtualbox-svn - pkgver = 68769 - pkgrel = 2 + pkgver = 70753 + pkgrel = 1 url = http://virtualbox.org - arch = i686 arch = x86_64 license = GPL license = custom @@ -57,15 +56,14 @@ pkgbase = virtualbox-svn source = vboxweb.service source = vboxreload source = 002-dri-driver-path.patch - source = 003-ogl-include-path.patch source = 005-gsoap-build.patch source = 006-rdesktop-vrdp-keymap-path.patch source = 007-python2-path.patch source = 008-no-vboxvideo.patch - source = 009-glibc-2.26.patch + source = 009-include-path.patch sha256sums = SKIP - sha256sums = 292fa3a414c125cf9119c8f2d866f3bd3a36c37842c9f68e6bbf74801860cd8a - sha256sums = f4c4ec1b2d25c64d3b334d487d4fbf6e06e072d252a0979f73a47a41e4afdcf7 + sha256sums = deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec + sha256sums = 113f9b92141b85df01f1e74d22f01d1f1aa81650eb79b89ceefc3cae20afe2e2 sha256sums = 2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c sha256sums = da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e sha256sums = 9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e @@ -75,13 +73,12 @@ pkgbase = virtualbox-svn sha256sums = 01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce sha256sums = e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f sha256sums = 2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac - sha256sums = ee54fe188e27b6e80e2044ea9ba1874db2ca2c026ad04f393be1be69c18d440d - sha256sums = a094a37ce710452e45f14eaec3e10bd71054aa910cf463b36a8b3ec42be466a1 + sha256sums = f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0 sha256sums = 7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46 sha256sums = 5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc sha256sums = 6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f sha256sums = 8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc - sha256sums = 3b6ad08a80f9f8c02c0c3625b7c96150056b466b8f32740b242a55736c282ec7 + sha256sums = 1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4 makedepends_x86_64 = gcc-multilib makedepends_x86_64 = lib32-glibc @@ -129,7 +126,6 @@ pkgname = virtualbox-host-dkms-svn optdepends = linux-lts-headers: build modules against LTS kernel optdepends = linux-zen-headers: build modules against ZEN kernel provides = VIRTUALBOX-HOST-MODULES-SVN - provides = virtualbox-host-dkms conflicts = virtualbox-source conflicts = virtualbox-host-source conflicts = virtualbox-host-dkms @@ -147,7 +143,6 @@ pkgname = virtualbox-guest-dkms-svn optdepends = linux-lts-headers: build modules against LTS kernel optdepends = linux-zen-headers: build modules against ZEN kernel provides = VIRTUALBOX-GUEST-MODULES-SVN - provides = virtualbox-guest-dkms conflicts = virtualbox-archlinux-source conflicts = virtualbox-guest-source conflicts = virtualbox-guest-dkms @@ -174,7 +169,6 @@ pkgname = virtualbox-guest-utils-svn depends = libxt depends = xorg-xrandr depends = VIRTUALBOX-GUEST-MODULES-SVN - provides = virtualbox-guest-utils conflicts = virtualbox-archlinux-additions conflicts = virtualbox-guest-additions conflicts = virtualbox-guest-utils-nox @@ -187,7 +181,6 @@ pkgname = virtualbox-guest-utils-nox-svn depends = glibc depends = pam depends = VIRTUALBOX-GUEST-MODULES-SVN - provides = virtualbox-guest-utils-nox conflicts = virtualbox-guest-utils conflicts = virtualbox-guest-utils-nox diff --git a/002-dri-driver-path.patch b/002-dri-driver-path.patch index 777e8e73b8b2..26b7f3f65f44 100644 --- a/002-dri-driver-path.patch +++ b/002-dri-driver-path.patch @@ -1,18 +1,19 @@ -# 2013 © Sébastien Luttringer ---- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-09-04 21:03:47.040743507 +0200 -+++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-10-20 23:23:49.705371815 +0200 -@@ -58,23 +58,8 @@ +diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +index 92b4ffc..1a1c467 100644 +--- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ++++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +@@ -56,24 +56,8 @@ typedef enum { + //#define DEBUG_DRI_CALLS - //@todo this could be different... +-/// @todo this could be different... -#ifdef RT_ARCH_AMD64 -# ifdef RT_OS_FREEBSD -# define DRI_DEFAULT_DRIVER_DIR "/usr/local/lib/dri" -# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/" -# else -# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/xorg/modules/dri" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" +-# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" -# endif -#else -# ifdef RT_OS_FREEBSD @@ -20,7 +21,8 @@ -# define DRI_XORG_DRV_DIR "/usr/local/lib/xorg/modules/drivers/" -# else -# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/xorg/modules/dri" --# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" ++# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" + # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" -# endif -#endif diff --git a/003-ogl-include-path.patch b/003-ogl-include-path.patch deleted file mode 100644 index cce1079cd3af..000000000000 --- a/003-ogl-include-path.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- VirtualBox/src/VBox/Additions/common/crOpenGL/Makefile.kmk.orig 2017-09-14 23:57:58.834458822 +0000 -+++ VirtualBox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2017-09-14 23:59:49.918241816 +0000 -@@ -69,16 +69,9 @@ VBoxOGL_INCS = . $(VBOX_GRAPHI - if1of ($(KBUILD_TARGET), linux solaris freebsd) - ifndef VBOX_USE_SYSTEM_GL_HEADERS - VBoxOGL_INCS += \ -- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ -- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ -- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \ -- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ -- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ -- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ -- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ -- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ -- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ -- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 \ - $(VBOX_GL_INCS) - endif - VBoxOGL_DEFS += VBOX_NO_NATIVEGL -@@ -218,11 +211,7 @@ if1of ($(KBUILD_TARGET), linux solaris f - ifdef VBOX_USE_SYSTEM_GL_HEADERS - VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext - else -- VBoxOGL_LIBS += \ -- $(PATH_STAGE_LIB)/libXcomposite.so \ -- $(PATH_STAGE_LIB)/libXdamage.so \ -- $(PATH_STAGE_LIB)/libXfixes.so \ -- $(PATH_STAGE_LIB)/libXext.so -+ VBoxOGL_LIBS += Xcomposite Xdamage Xfixes Xext - endif - ifdef VBoxOGL_FAKEDRI - ifeq ($(KBUILD_TARGET), freebsd) diff --git a/009-include-path.patch b/009-include-path.patch new file mode 100644 index 000000000000..c23217414aba --- /dev/null +++ b/009-include-path.patch @@ -0,0 +1,85 @@ +diff --git a/src/VBox/HostDrivers/Support/linux/Makefile b/src/VBox/HostDrivers/Support/linux/Makefile +index d199047..34d895f 100644 +--- a/src/VBox/HostDrivers/Support/linux/Makefile ++++ b/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 +diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile +index 694cb5c..8487820 100644 +--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile ++++ b/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 +diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile +index e262c61..ca956d5 100644 +--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile ++++ b/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 +diff --git a/src/VBox/HostDrivers/VBoxPci/linux/Makefile b/src/VBox/HostDrivers/VBoxPci/linux/Makefile +index 6b3878a..7b8a8a2 100644 +--- a/src/VBox/HostDrivers/VBoxPci/linux/Makefile ++++ b/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 @@ -10,9 +10,9 @@ pkgname=('virtualbox-svn' 'virtualbox-guest-utils-svn' 'virtualbox-guest-utils-nox-svn' 'virtualbox-ext-vnc-svn') -pkgver=68769 -pkgrel=2 -arch=('i686' 'x86_64') +pkgver=70753 +pkgrel=1 +arch=('x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('alsa-lib' @@ -65,16 +65,15 @@ source=("VirtualBox::svn+http://www.virtualbox.org/svn/vbox/trunk" 'vboxweb.service' 'vboxreload' '002-dri-driver-path.patch' - '003-ogl-include-path.patch' '005-gsoap-build.patch' '006-rdesktop-vrdp-keymap-path.patch' '007-python2-path.patch' '008-no-vboxvideo.patch' - '009-glibc-2.26.patch' + '009-include-path.patch' ) sha256sums=('SKIP' - '292fa3a414c125cf9119c8f2d866f3bd3a36c37842c9f68e6bbf74801860cd8a' - 'f4c4ec1b2d25c64d3b334d487d4fbf6e06e072d252a0979f73a47a41e4afdcf7' + 'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec' + '113f9b92141b85df01f1e74d22f01d1f1aa81650eb79b89ceefc3cae20afe2e2' '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c' 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e' '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e' @@ -84,13 +83,13 @@ sha256sums=('SKIP' '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce' 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f' '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac' - 'ee54fe188e27b6e80e2044ea9ba1874db2ca2c026ad04f393be1be69c18d440d' - 'a094a37ce710452e45f14eaec3e10bd71054aa910cf463b36a8b3ec42be466a1' + 'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0' '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46' '5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc' '6bdb017459532537199c399eefd3d84d8dc7f1786e79997caebd3b6eb5c75d9f' '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc' - '3b6ad08a80f9f8c02c0c3625b7c96150056b466b8f32740b242a55736c282ec7') + '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4' + ) pkgver() { cd "VirtualBox" @@ -116,6 +115,9 @@ prepare() { msg2 'Use our CFLAGS' echo "VBOX_GCC_OPT=$CXXFLAGS" >> LocalConfig.kmk + msg2 'Use system GL headers' + echo 'VBOX_USE_SYSTEM_GL_HEADERS=true' >> LocalConfig.kmk + msg2 'Remove gcc version censorship' sed -i 's/^check_gcc$/#check_gcc/' configure } @@ -144,7 +146,6 @@ build() { } package_virtualbox-svn() { - _pkgname=virtualbox pkgdesc='Powerful x86 virtualization for enterprise as well as home use' depends=('glibc' 'openssl' 'curl' 'gcc-libs' 'libpng' 'python2' 'sdl' 'libvpx' 'libxml2' 'procps-ng' 'shared-mime-info' 'zlib' @@ -155,9 +156,9 @@ package_virtualbox-svn() { 'virtualbox-ext-vnc: VNC server support' 'virtualbox-sdk: Developer kit') backup=('etc/vbox/vbox.cfg') + provides=('virtualbox') replaces=('virtualbox-ose') conflicts=('virtualbox-ose' 'virtualbox') - provides=('virtualbox') install=virtualbox.install source "VirtualBox/env.sh" @@ -228,7 +229,7 @@ package_virtualbox-svn() { cd "$srcdir" #licence - install -Dm644 VirtualBox/COPYING "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" + install -Dm644 VirtualBox/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # install systemd stuff install -Dm644 60-vboxdrv.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules" @@ -241,7 +242,6 @@ package_virtualbox-svn() { } package_virtualbox-sdk-svn() { - _pkgname=virtualbox-sdk pkgdesc='VirtualBox Software Developer Kit (SDK)' depends=('python2') provides=('virtualbox-sdk') @@ -261,7 +261,7 @@ package_virtualbox-sdk-svn() { cp -r sdk "$pkgdir/usr/lib/virtualbox" # licence install -Dm644 "$srcdir/VirtualBox/COPYING" \ - "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_virtualbox-host-dkms-svn() { @@ -272,7 +272,7 @@ package_virtualbox-host-dkms-svn() { 'virtualbox-host-source' 'virtualbox-host-modules-lts') conflicts=('virtualbox-source' 'virtualbox-host-source' 'virtualbox-host-dkms') - provides=('VIRTUALBOX-HOST-MODULES-SVN' 'virtualbox-host-dkms') + provides=('VIRTUALBOX-HOST-MODULES-SVN') optdepends=('linux-headers: build modules against Arch kernel' 'linux-lts-headers: build modules against LTS kernel' 'linux-zen-headers: build modules against ZEN kernel') @@ -302,7 +302,7 @@ package_virtualbox-guest-dkms-svn() { replaces=('virtualbox-archlinux-source' 'virtualbox-guest-source' 'virtualbox-guest-modules-lts') - provides=('VIRTUALBOX-GUEST-MODULES-SVN' 'virtualbox-guest-dkms') + provides=('VIRTUALBOX-GUEST-MODULES-SVN') conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source' 'virtualbox-guest-dkms') optdepends=('linux-headers: build modules against Arch kernel' 'linux-lts-headers: build modules against LTS kernel' @@ -327,14 +327,12 @@ package_virtualbox-guest-dkms-svn() { } package_virtualbox-guest-utils-svn() { - _pkgname=virtualbox-guest-utils pkgdesc='VirtualBox Guest userspace utilities' depends=('glibc' 'pam' 'libx11' 'libxcomposite' 'libxdamage' 'libxext' 'libxfixes' 'libxmu' 'libxt' 'xorg-xrandr' 'VIRTUALBOX-GUEST-MODULES-SVN') replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox' 'virtualbox-guest-utils') - provides=('virtualbox-guest-utils') source "VirtualBox/env.sh" pushd "VirtualBox/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" @@ -354,14 +352,12 @@ package_virtualbox-guest-utils-svn() { install -Dm644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service" install -Dm644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf" # licence - install -Dm644 VirtualBox/COPYING "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" + install -Dm644 VirtualBox/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_virtualbox-guest-utils-nox-svn() { - _pkgname=virtualbox-guest-utils-nox pkgdesc='VirtualBox Guest userspace utilities without X support' depends=('glibc' 'pam' 'VIRTUALBOX-GUEST-MODULES-SVN') - provides=('virtualbox-guest-utils-nox') conflicts=('virtualbox-guest-utils' 'virtualbox-guest-utils-nox') source "VirtualBox/env.sh" @@ -376,11 +372,10 @@ package_virtualbox-guest-utils-nox-svn() { install -Dm644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf" # licence install -Dm644 "$srcdir/VirtualBox/COPYING" \ - "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_virtualbox-ext-vnc-svn() { - _pkgname=virtualbox-ext-vnc pkgdesc='VirtualBox VNC extension pack' depends=('virtualbox' 'libvncserver') optdepends=('tigervnc: vnc client') @@ -393,7 +388,7 @@ package_virtualbox-ext-vnc-svn() { install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-svn.vbox-extpack" # licence install -Dm644 "$srcdir/VirtualBox/COPYING" \ - "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=4 sw=4 et: diff --git a/virtualbox-guest-dkms.conf b/virtualbox-guest-dkms.conf index 3b2cb11bcc73..d0281dfebded 100644 --- a/virtualbox-guest-dkms.conf +++ b/virtualbox-guest-dkms.conf @@ -19,19 +19,13 @@ PACKAGE_VERSION=@VERSION@_OSE AUTOINSTALL=yes BUILT_MODULE_NAME[0]="vboxguest" -MAKE[0]="make" -CLEAN[0]="make clean" BUILT_MODULE_LOCATION[0]="vboxguest" DEST_MODULE_LOCATION[0]="/kernel/misc" BUILT_MODULE_NAME[1]="vboxsf" -MAKE[1]="make" -CLEAN[1]="make clean" BUILT_MODULE_LOCATION[1]="vboxsf" DEST_MODULE_LOCATION[1]="/kernel/misc" BUILT_MODULE_NAME[2]="vboxvideo" -MAKE[2]="make" -CLEAN[2]="make clean" BUILT_MODULE_LOCATION[2]="vboxvideo" DEST_MODULE_LOCATION[2]="/kernel/misc" diff --git a/virtualbox-host-dkms.conf b/virtualbox-host-dkms.conf index f00a1f49d982..a8b41bf40027 100644 --- a/virtualbox-host-dkms.conf +++ b/virtualbox-host-dkms.conf @@ -19,25 +19,17 @@ PACKAGE_VERSION=@VERSION@_OSE AUTOINSTALL=yes BUILT_MODULE_NAME[0]="vboxdrv" -MAKE[0]="make" -CLEAN[0]="make clean" BUILT_MODULE_LOCATION[0]="vboxdrv" DEST_MODULE_LOCATION[0]="/kernel/misc" BUILT_MODULE_NAME[1]="vboxnetflt" -MAKE[1]="make" -CLEAN[1]="make clean" BUILT_MODULE_LOCATION[1]="vboxnetflt" DEST_MODULE_LOCATION[1]="/kernel/misc" BUILT_MODULE_NAME[2]="vboxnetadp" -MAKE[2]="make" -CLEAN[2]="make clean" BUILT_MODULE_LOCATION[2]="vboxnetadp" DEST_MODULE_LOCATION[2]="/kernel/misc" BUILT_MODULE_NAME[3]="vboxpci" -MAKE[3]="make" -CLEAN[3]="make clean" BUILT_MODULE_LOCATION[3]="vboxpci" DEST_MODULE_LOCATION[3]="/kernel/misc" |