From 51e7c083b849fb1a2a7bb8c7d7313d1c72167c74 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Apr 2016 16:22:23 +0100 Subject: drop virtualbox, we use the one from gentoo tree --- .../files/vboxclient.desktop | 7 -- .../files/vboxguest-4.1.0-log-use-c99.patch | 13 ---- .../files/virtualbox-guest-additions-3-localconfig | 30 --------- .../files/virtualbox-guest-additions-3.19.patch | 76 ---------------------- .../files/virtualbox-guest-additions-8.initd | 26 -------- .../files/virtualbox-guest-additions.service | 16 ----- .../files/xorg.conf.vbox | 13 ---- 7 files changed, 181 deletions(-) delete mode 100644 app-emulation/virtualbox-guest-additions/files/vboxclient.desktop delete mode 100644 app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch delete mode 100644 app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3-localconfig delete mode 100644 app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.19.patch delete mode 100644 app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd delete mode 100644 app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.service delete mode 100644 app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox (limited to 'app-emulation/virtualbox-guest-additions/files') diff --git a/app-emulation/virtualbox-guest-additions/files/vboxclient.desktop b/app-emulation/virtualbox-guest-additions/files/vboxclient.desktop deleted file mode 100644 index 316eb9f6..00000000 --- a/app-emulation/virtualbox-guest-additions/files/vboxclient.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=VirtualBox Client Service -Exec=VBoxClient-all -Terminal=false -X-KDE-StartupNotify=false -StartupNotify=false diff --git a/app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch b/app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch deleted file mode 100644 index f3a738fa..00000000 --- a/app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch +++ /dev/null @@ -1,13 +0,0 @@ -# https://bugs.gentoo.org/298988 - ---- vboxguest/Makefile -+++ vboxguest/Makefile -@@ -104,7 +104,7 @@ - - MOD_DEFS = -DVBOX -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_GUEST \ - -DIN_GUEST_R0 -DIN_MODULE -DRT_WITH_VBOX -DVBGL_VBOXGUEST \ -- -DVBOX_WITH_HGCM -+ -DVBOX_WITH_HGCM -DLOG_USE_C99 - ifeq ($(BUILD_TARGET_ARCH),amd64) - MOD_DEFS += -DRT_ARCH_AMD64 - else diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3-localconfig b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3-localconfig deleted file mode 100644 index aeea54d6..00000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3-localconfig +++ /dev/null @@ -1,30 +0,0 @@ -# -*- Makefile -*- -# -# Overwrite some default kBuild settings -# - -# -# Copyright (C) 2006-2008 Sun Microsystems, Inc. -# -# This file is part of VirtualBox Open Source Edition (OSE), as -# available from http://www.virtualbox.org. This file is free software; -# you can redistribute it and/or modify it under the terms of the GNU -# General Public License as published by the Free Software Foundation, -# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE -# distribution. VirtualBox OSE is distributed in the hope that it will -# be useful, but WITHOUT ANY WARRANTY of any kind. -# - -# don't build testcases to save time, they are not needed for the package -VBOX_WITH_TESTCASES := -VBOX_WITH_TESTSUITE := - -KBUILD_MSG_STYLE := brief - -## paths, origin, hardening -VBOX_WITH_HARDENING := 2 -VBOX_WITH_ORIGIN := -VBOX_ONLY_ADDITIONS := 1 - -## don't build with -Werror -VBOX_WITH_WARNINGS_AS_ERRORS := diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.19.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.19.patch deleted file mode 100644 index d0eea45d..00000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.19.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- a/vboxsf/dirops.c -+++ b/vboxsf/dirops.c -@@ -127,13 +127,11 @@ - TRACE(); - -- sf_g = GET_GLOB_INFO(dir->f_dentry->d_inode->i_sb); -+ inode = GET_F_DENTRY(dir)->d_inode; -+ sf_i = GET_INODE_INFO(inode); -+ sf_g = GET_GLOB_INFO(inode->i_sb); - sf_d = dir->private_data; - - BUG_ON(!sf_g); - BUG_ON(!sf_d); -- -- inode = dir->f_dentry->d_inode; -- sf_i = GET_INODE_INFO(inode); -- - BUG_ON(!sf_i); - ---- a/vboxsf/regops.c -+++ b/vboxsf/regops.c -@@ -109,5 +109,5 @@ - size_t left = size; - ssize_t total_bytes_read = 0; -- struct inode *inode = file->f_dentry->d_inode; -+ struct inode *inode = GET_F_DENTRY(file)->d_inode; - struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb); - struct sf_reg_info *sf_r = file->private_data; -@@ -184,5 +184,5 @@ - size_t left = size; - ssize_t total_bytes_written = 0; -- struct inode *inode = file->f_dentry->d_inode; -+ struct inode *inode = GET_F_DENTRY(file)->d_inode; - struct sf_inode_info *sf_i = GET_INODE_INFO(inode); - struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb); -@@ -455,5 +455,5 @@ - static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vaddr, int *type) - # define SET_TYPE(t) *type = (t) --#else /* LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0) */ -+#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) */ - static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vaddr, int unused) - # define SET_TYPE(t) -@@ -466,5 +466,5 @@ - int err; - struct file *file = vma->vm_file; -- struct inode *inode = file->f_dentry->d_inode; -+ struct inode *inode = GET_F_DENTRY(file)->d_inode; - struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb); - struct sf_reg_info *sf_r = file->private_data; -@@ -606,5 +606,5 @@ - static int sf_readpage(struct file *file, struct page *page) - { -- struct inode *inode = file->f_dentry->d_inode; -+ struct inode *inode = GET_F_DENTRY(file)->d_inode; - struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb); - struct sf_reg_info *sf_r = file->private_data; ---- a/vboxsf/vfsmod.h -+++ b/vboxsf/vfsmod.h -@@ -146,5 +146,5 @@ - #endif - --#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 19) || defined(KERNEL_FC6) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) || defined(KERNEL_FC6) - /* FC6 kernel 2.6.18, vanilla kernel 2.6.19+ */ - # define GET_INODE_INFO(i) ((struct sf_inode_info *) (i)->i_private) -@@ -156,4 +156,10 @@ - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) -+# define GET_F_DENTRY(f) (f->f_path.dentry) -+#else -+# define GET_F_DENTRY(f) (f->f_dentry) - #endif - -+#endif -+ diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd deleted file mode 100644 index 9de2ee07..00000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd,v 1.2 2013/02/11 22:13:47 polynomial-c Exp $ - -pidfile="/var/run/vboxguest-service.pid" -command="/usr/sbin/vboxguest-service" -command_args="--foreground" -start_stop_daemon_args="--make-pidfile --pidfile ${pidfile} --background" - -depend() { - need dbus localmount - before xdm -} - -start_pre() { - einfo "Loading kernel modules" - /sbin/modprobe vboxguest 2>&1 - /sbin/modprobe vboxsf 2>&1 -} - -stop_post() { - einfo "Removing kernel modules" - /sbin/modprobe -r vboxsf 2>&1 - /sbin/modprobe -r vboxguest 2>&1 -} diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.service b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.service deleted file mode 100644 index 35f9ce24..00000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=VirtualBox Guest Additions -ConditionVirtualization=oracle -Before=display-manager.service - -[Service] -Type=simple -ExecStartPre=/sbin/modprobe vboxguest -ExecStartPre=/sbin/modprobe vboxsf -ExecStart=/usr/sbin/vboxguest-service --foreground -ExecStopPost=/sbin/modprobe -r vboxsf -ExecStopPost=/sbin/modprobe -r vboxguest -PIDFile=/var/run/vboxguest-service.pid - -[Install] -WantedBy=multi-user.target diff --git a/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox b/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox deleted file mode 100644 index a8624694..00000000 --- a/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox +++ /dev/null @@ -1,13 +0,0 @@ -Section "Device" - Identifier "Device-vboxvideo" - Driver "vboxvideo" -EndSection -Section "Screen" - Identifier "Screen-vboxvideo" - Device "Device-vboxvideo" -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Screen-vboxvideo" -EndSection -- cgit v1.2.3