This is needed to compile the Virtual Box guest additions with the 3.13
kernel (and thus the grsecurity testing kernel).
Signed-off-by: Austin Seipp <aseipp@pobox.com>
In most cases, this just meant changing kernelDev (now removed from
linuxPackagesFor) to kernel.dev. Some packages needed more work (though
whether that was because of my changes or because they were already
broken, I'm not sure). Specifics:
* psmouse-alps builds on 3.4 but not 3.10, as noted in the comments that
were already there
* blcr builds on 3.4 but not 3.10, as noted in comments that were
already there
* open-iscsi, ati-drivers, wis-go7007, and openafsClient don't build on
3.4 or 3.10 on this branch or on master, so they're marked broken
* A version-specific kernelHeaders package was added
The following packages were removed:
* atheros/madwifi is superceded by official ath*k modules
* aufs is no longer used by any of our kernels
* broadcom-sta v6 (which was already packaged) replaces broadcom-sta
* exmap has not been updated since 2011 and doesn't build
* iscis-target has not been updated since 2010 and doesn't build
* iwlwifi is part of mainline now and doesn't build
* nivida-x11-legacy-96 hasn't been updated since 2008 and doesn't build
Everything not specifically mentioned above builds successfully on 3.10.
I haven't yet tested on 3.4, but will before opening a pull request.
Signed-off-by: Shea Levy <shea@shealevy.com>
A recent X update broke VirtualBox guest additions (vboxvideo driver version
mismatch, desktop won't start). This fixes it.
Here is the error log:
(II) "glx" will be loaded by default.
(II) LoadModule: "glx"
(II) Loading /nix/store/kzvmnjlps51q4piqmwr7zbmxcg2z9vgk-xorg-server-1.13.4/lib/xorg/modules/extensions/libglx.so
(II) Module glx: vendor="X.Org Foundation"
compiled for 1.13.4, module version = 1.0.0
ABI class: X.Org Server Extension, version 7.0
(==) AIGLX enabled
Loading extension GLX
(II) LoadModule: "vboxvideo"
(II) Loading /nix/store/4kbxi00h8xsmfgbws2qqh674lcfp03h6-VirtualBox-GuestAdditions-4.2.14-3.2.46/lib/xorg/modules/drivers/vboxvideo_drv.so
(II) Module vboxvideo: vendor="Oracle Corporation"
compiled for 10.12.0, module version = 1.0.1
Module class: X.Org Video Driver
ABI class: X.Org Video Driver, version 12.0
(EE) module ABI major version (12) doesn't match the server's version (13)
(II) UnloadModule: "vboxvideo"
(II) Unloading vboxvideo
(EE) Failed to load module "vboxvideo" (module requirement mismatch, 0)
(II) LoadModule: "vboxmouse"
(WW) Warning, couldn't open module vboxmouse
(II) UnloadModule: "vboxmouse"
(II) Unloading vboxmouse
(EE) Failed to load module "vboxmouse" (module does not exist, 0)
(EE) No drivers available.
Fatal server error:
no screens found
All patch files dropped because they're fixed in this release. For a full list
of fixes that come with this maintenance release, please refer to:
https://www.virtualbox.org/wiki/Changelog
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)
Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)
The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.
Signed-off-by: Shea Levy <shea@shealevy.com>
Outrageous! They fixed the tarball by including the missing file.
Well, at least we now don't have that much cruft laying around and can remove
that rather long patch.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This patch is cherry-picked from VirtualBox Subversion, revision 44867.
It's rather small and only is in effect if kernel version is >= 3.9.0, so it
won't break existing kernels, so I'm adding it here despite we usually only care
about the latest stable upstream (kernel) versions.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This adds a patch to support CONFIG_UIDGID_STRICT_TYPE_CHECKS being activated in
the kernel config (selected by CONFIG_USER_NS for example).
When this kernel option is enabled, current->cred->uid is a structure rather
than a simple integer type (uid_t and gid_t), so we need to check for that and
also pass the current user namespace where needed.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
The tarball for this version is missing the file VRDEVideoIn.h, which is added
through the missing_files_4.2.8.patch and extracted from Subversion, revision
44528.
Upstream changelog(s) can be found at the usual place:
https://www.virtualbox.org/wiki/Changelog
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fortunately this time the upstream package was packaged correctly and we no
longer need the patch to remove the reference to the fa_IR locale.
In addition we need to add lvm2 to dependencies because VirtualBox now requires
libdevmapper with its default configuration. We could disable it but in order to
gain DM support I think it's necessary and at least could avoid some confusion
from users if it's not working "out of the box" :-)
This is a bugfix release, upstream changes are:
* VMM: don't inject stale VT-x events to prevent crashes after VM reset
* VMM: workaround for buggy BIOSes which enable MONITOR only for certain CPUs
* GUI: fixed trimming of anti-aliased text in details-view element headers
* GUI: fixed create-settings-file-alias functionality on Mac hosts
* GUI: fixed take-guest-screenshot functionality on Windows hosts
* GUI: several minor fixes, including palette fixes
* GUI: fixed Windows 2012 OS type
* GUI: allow to terminate the VM even if VBoxSVC crashed
* API: fixed cancelling of snapshots, previously this could lead to
inconsistent VM configs
* API: fixed identifying disk images by UUID
* 3D Support: several fixes
* VRDP: fixed occasional crash with external authentication
* VGA: fix for double scan text modes
* USB: fixed invalid pending request count at the time of service of DEVICE
POWER requests (Windows hosts only)
* USB keyboard: Korean keyboard workaround
* Storage: fixed hang with QCOW images and asynchronous I/O enabled
* Storage: fixed hang with newer VHD images
* Storage: actually write the non-rotational flag to the VM settings (4.2.0
regression)
* Virtio-net: fixed the problem with network statistics counters in Session
Information dialog (GUI)
* Metrics: introduced network rate and disk usage metrics
* Metrics: fixed a crash under certain conditions on Solaris hosts
* BIOS: fix for El Torito
* Shared Folders: if the host folder of a shared folder mapping does not exist,
keep it active but mark it as invalid to prevent inconsistent
saved states
* VBoxManage: fixed converting disks from raw images
* VBoxManage: show snapshot description in the VM or snapshot information
* VBoxManage: make implicit opening of media consistent in all places dealing
with media
* VBoxManage: the iSCSI initiator name was not stored in the settings file when
doing storageattach
* VBoxManage: metrics collect now properly handles 'CPU/MHz' and
'Net/*/LinkSpeed' metrics
* VBoxManage: changing the image UUID or parent UUID as part of storageattach
works now in all safe cases
* VBoxManage: introduced storageattach --medium additions as a shortcut to
mount the additions image
* OVF: fixed importing OVF files cerated by recent VMware products
* Linux hosts / Bridged Networking: fixed the problem with leaking connections
in conntrack
* Linux Additions: added support for ConsoleKit sessions in the vminfo service
of VBoxService
* Linux Additions: don't crash during remount under certain conditions
* Linux/Solaris Additions: fixed guest memory metrics collection
* Solaris hosts: added a dependency to ensure that the user directories are
reachable when starting VBox services
* Windows host installer: integrated user-contributed translations, thanks to
all contributors!
* Windows Additions: fixed auto-logon installation for Windows 8
* Windows Additions: don't fail if the shared folders host service is not
available
* Windows Additions: fixed Guest Additions startup on Windows 2000 guests
* Windows Additions: auto-resize fixes for Windows 8 guests
Upstream changelist with bug ids can be found here:
https://www.virtualbox.org/wiki/Changelog
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
The extension pack is needed in order to have USB 2.0, RDP and PXE boot support
and is _not_ part of the free version, so please read their conditions before
using it:
https://www.virtualbox.org/wiki/VirtualBox_PUEL
Further information and details about the extension pack is available here:
https://www.virtualbox.org/manual/ch01.html#intro-installing
I'm wimping out here and use requireFile to ask the user to fetch the extension
pack manually, simply because I'm not a lawyer. I've seen other distributions
that fetch the extension packs directly from upstream, but I'm not sure if that
is according to Oracle's PUEL.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This updates both virtualbox and guest additions.
Upstream changes in this release:
* GUI: fixed validation warning on global settings / proxy page (4.2.2
regression)
* GUI: fixed crash with multiple guest screens on certain conditions (OS X
hosts only)
* VBoxBalloonCtrl: fixed command line argument handling of ballooning module
* VRDP: fixed occasional crash during a video playback in the guest
* BIOS: fixed broken DMI information (4.2 regression)
* BIOS: workaround for booting from Windows 2000 floppy disks
* EFI: fixed video mode selection loss on VM reboot
* Parallel: fixed parallel port printing failure/ paper queue empty error
(Windows hosts only)
* NAT: fixed crash on alias-less DNS responses when host-resolver is used
* Storage: fixed hang under rare circumstances
With bug IDs: https://www.virtualbox.org/wiki/Changelog
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This should fix a few issues with charon and VMs crashing starting at an amount
of at least 4 running VMs in parallel.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This time, we need to patch, because the upstream tarball got messed up
somehow[TM]. You can find some details about the issue here:
https://www.virtualbox.org/pipermail/vbox-dev/2012-October/005408.html
Our patch is removing the language file, as it seems that even in SVN trunk it
isn't available anymore. So, let's hope we can remove this patch in the next
upstream release.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Upstream changes are:
* VMM: fixed a potential host crash triggered by shutting down a VM when
another VM was running (only affected 32-bit hosts and 64-bit OS X
hosts, 4.1 regression)
* VMM: fixed a potential host crash under a high guest memory pressure (seen
with Windows 8 guests)
* VMM: respect RAM preallocation while restoring saved state.
* VMM: fixed handling of task gates if VT-x/AMD-V is disabled
* Storage: fixed audio CD passthrough for certain media players
* USB: don't crash if a USB device is plugged or unplugged when saving or
loading the VM state (SMP guests only)
* RTC: fixed a potential corruption of CMOS bank 1
* Mac OS X hosts: installer fixes for Leopard (4.1.20 regression)
* Windows Additions: fixed memory leak in VBoxTray
Full changelogs with bug ids and links to it can be found at:
https://www.virtualbox.org/wiki/Changelog
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
First of all, modules won't install when there is no "make modules" prior to it,
so we're doing this now with a new function called forEachModule, so we can
avoid duplication as much as possible.
In addition this sets $sourcedir to the current directory of the configurePhase,
so we're able to find the source tree later on, after several chdir()s.
The scripts/depmod.sh checks whether the path in $DEPMOD is executable and only
executes it if that's the case. So, by setting DEPMOD to "/do_not_use_depmod"
the destination path doesn't exist _and_ thus isn't executable aswell.
The for loop didn't find $curdir, because it was set _after_ the directory has
been changed. The variable is now called $srcroot and is set before the
installPhase is changing directories.
Don't rely on VirtualBox's in-tree build scripts to set include paths correctly
and use the official way of the Linux kernel to build the modules. That way we
don't need to make ugly symlinks in the kernel tree or heavily patch VirtualBox.
longer seems needed. Optionally build the Python bindings. Disable
the Java bindings by default to prevent a gratuitous dependency on
the JDK.
svn path=/nixpkgs/trunk/; revision=33295
