summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-09-19 01:27:07 -0700
committerroot <root@rshg054.dnsready.net>2012-09-19 01:27:07 -0700
commit3e9f7fe2a26ee7496abdc6e9e4b54c4f5caddcae (patch)
treef46a9b554f74e65e41a6b29012981878a5a0bdea /libre/virtualbox-libre
parent0eb0f7dcc1b8f07ad3f0eb5086eafba8f627967d (diff)
Wed Sep 19 01:26:10 PDT 2012
Diffstat (limited to 'libre/virtualbox-libre')
-rw-r--r--libre/virtualbox-libre/PKGBUILD175
-rw-r--r--libre/virtualbox-libre/free-distros.patch1016
-rw-r--r--libre/virtualbox-libre/libre.patch412
-rw-r--r--libre/virtualbox-libre/vboxdrv-reference.patch8
-rwxr-xr-xlibre/virtualbox-libre/virtualbox-libre-guest-additions.install31
-rwxr-xr-xlibre/virtualbox-libre/virtualbox-libre-guest-source.install29
-rwxr-xr-xlibre/virtualbox-libre/virtualbox-libre-host-source.install29
7 files changed, 888 insertions, 812 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index ceff911bc..cff380c81 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,32 +1,68 @@
# $Id$
# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
pkgbase=virtualbox-libre
pkgname=('virtualbox-libre'
- 'virtualbox-libre-parabola-additions'
'virtualbox-libre-sdk'
- 'virtualbox-libre-source'
- 'virtualbox-libre-parabola-source')
-pkgver=4.1.22
-pkgrel=1.3
+ 'virtualbox-libre-host-source'
+ 'virtualbox-libre-guest-additions'
+ 'virtualbox-libre-guest-source')
+pkgver=4.2.0
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl-libre' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2')
+'xalan-c' 'sdl-libre' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2' 'cdrkit')
#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
- 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk ipv6_vnc.patch
+ 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk
change_default_driver_dir.patch vboxservice.conf vboxservice.rc vboxservice.service
vboxweb.conf vboxweb.rc vboxweb.service os_blag_64.png os_blag.png os_dragora_64.png
os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png os_gnu_64.png
os_gnuhurd.png os_gnulinux_64.png os_gnulinux.png os_gnu.png os_musix_64.png
os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png
os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch)
+md5sums=('691b4134983ce7d89b9fb683305cb647'
+ '5f85710e0b8606de967716ded7b2d351'
+ 'aa0c090e33aab3e2853b679cc52cba2a'
+ '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
+ '97e193f050574dd272a38e5ee5ebe62b'
+ '3c08ad30b89add47d3f45121200a5360'
+ '7d9823507206de9b8528a72af2f18d74'
+ '07c5f6d86c4b7839d719c8ee0c53653b'
+ '7e9483b1069a54f181546083ac7e5469'
+ 'c159d683ba1947290fc2ad2c64194150'
+ 'bc9efed88e0469cd7fc460d5a5cd7b4b'
+ '8538dba8686d7449cb481c9bae9d722a'
+ '545c925b46f2ac95e5f8ae407fad101a'
+ 'f6416f509c2e5460e4dc624e0a57f3c1'
+ 'bbfb59dd517c020a23701b480187a355'
+ 'efacfdb61918286ea9bc89866b8fd239'
+ '7c3eb09995e8bafeef414374e44ad4ce'
+ 'a49ed3ab6bd0fb084de0ab3dd97ae93e'
+ '6b432b3305ed446125eef052c38355a6'
+ 'a70022a468bd3e9daf01818d2d74ac3c'
+ '6b432b3305ed446125eef052c38355a6'
+ 'a70022a468bd3e9daf01818d2d74ac3c'
+ 'a70022a468bd3e9daf01818d2d74ac3c'
+ '380eb2ab6cad3da198094585853c129c'
+ 'a60bb9a98abcc3c34156f9051d00df9a'
+ '3a908ef6952bcf987e63ef2fe4e98d24'
+ '02e87c39c353634cecacf98f1707fa15'
+ '0cf41a41e7a415d404d5584e047fd450'
+ '449cde3b58390284b59c5d663de3edc9'
+ 'c7951fe6888d939f3a7d0dafe477e82b'
+ '4da8eeb2ece7e475fc7a0d1003da26c6'
+ '5e4187af59726d71c5be48d0cd816c34'
+ '67cc4c8611890038eb3e4114ae899525'
+ '058c61d52984c1c3b23006f151ed1562')
_extramodules=extramodules-3.5-LIBRE
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
@@ -60,11 +96,14 @@ build() {
cp "$srcdir/LocalConfig.kmk" .
+ # fake makeself binary to compile without nofatal
+ ln -s /bin/echo makeself
+ export PATH="$CWD:$PATH"
+
./configure --disable-docs \
--enable-webservice \
--enable-vde \
--enable-vnc \
- --nofatal \
--with-linux=/usr/src/linux-${_kernver}
source ./env.sh
kmk all
@@ -77,11 +116,11 @@ build() {
package_virtualbox-libre() {
pkgdesc="Powerful x86 virtualization for enterprise as well as home use (without non-free distros and others OS presets for the VM creation wizard; Oracle VM VirtualBox Extension Pack support removed)"
- depends=('virtualbox-libre-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng')
+ depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng')
optdepends=('qt: for VirtualBox GUI'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-libre-sdk: developer kit'
- 'virtualbox-libre-source: host kernel libre source modules for non-stock kernels'
+ 'virtualbox-libre-host-source: host kernel libre source modules for non-stock kernels'
'net-tools: for host-only or bridged networking')
backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
@@ -160,24 +199,8 @@ package_virtualbox-libre() {
}
-package_virtualbox-libre-source() {
- pkgdesc="VirtualBox kernel libre modules source"
- depends=(dkms gcc make)
- replaces=('virtualbox-source')
- conflicts=('virtualbox-source')
- provides=("virtualbox-source=$pkgver" 'virtualbox-libre-modules')
- optdepends=('linux-libre-headers'
- 'linux-libre-lts-headers')
- install=virtualbox-libre-source.install
-
- install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver"
- source "VirtualBox-$pkgver/env.sh"
- cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source"
-}
-
package_virtualbox-libre-sdk() {
- pkgdesc="VirtualBox Software Developer Kit (SDK)"
+ pkgdesc='VirtualBox Software Developer Kit (SDK)'
depends=('python2')
replaces=('virtualbox-sdk')
conflicts=('virtualbox-sdk')
@@ -197,14 +220,46 @@ package_virtualbox-libre-sdk() {
mv sdk "$pkgdir/usr/lib/virtualbox"
}
-package_virtualbox-libre-parabola-additions(){
- pkgdesc="Additions only for Parabola guests (userspace tools)"
- depends=('virtualbox-libre-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
- replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
- conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
- provides=("virtualbox-archlinux-additions=${pkgver}")
+package_virtualbox-libre-host-source() {
+ pkgdesc='VirtualBox kernel libre modules source'
+ depends=('dkms' 'gcc' 'make')
+ provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules')
+ replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
+ conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source')
+ optdepends=('linux-libre-headers'
+ 'linux-libre-lts-headers')
+ install=virtualbox-libre-host-source.install
+
+ install -dm755 "$pkgdir/usr/src"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+ cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
+}
+
+package_virtualbox-libre-guest-source() {
+ pkgdesc='VirtualBox Additions kernel libre modules source'
+ depends=('dkms' 'gcc' 'make')
+ provides=("virtualbox-guest-source=${pkgver}" 'virtualbox-libre-guest-modules')
+ replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
+ conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source')
+ optdepends=('linux-libre-headers'
+ 'linux-libre-lts-headers')
+ install=virtualbox-libre-guest-source.install
+
+ install -dm755 "$pkgdir/usr/src"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
+}
+
+package_virtualbox-libre-guest-additions(){
+ pkgdesc='Additions for guests only (userspace tools)'
+ depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
+ provides=("virtualbox-guest-additions=${pkgver}")
+ replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions')
+ conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions')
backup=('etc/conf.d/vboxservice')
- install=virtualbox-libre-parabola-additions.install
+ install=virtualbox-libre-guest-additions.install
source "VirtualBox-$pkgver/env.sh"
@@ -235,55 +290,3 @@ package_virtualbox-libre-parabola-additions(){
install -D -m644 "$srcdir/vboxservice.service" \
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
}
-
-package_virtualbox-libre-parabola-source() {
- pkgdesc='VirtualBox Additions kernel libre modules source'
- depends=(dkms gcc make)
- replaces=('virtualbox-archlinux-source')
- conflicts=('virtualbox-archlinux-source')
- provides=("virtualbox-archlinux-source=${pkgver}" 'virtualbox-libre-parabola-modules')
- optdepends=('linux-libre-headers'
- 'linux-libre-lts-headers')
- install=virtualbox-libre-parabola-source.install
-
- install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver"
- source "VirtualBox-$pkgver/env.sh"
- cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
- cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source"
-}
-
-md5sums=('84c5beeead094ce52d098105897aadbb'
- '5f85710e0b8606de967716ded7b2d351'
- 'bf5d1eeeec20a042e8af34cd61a9e11b'
- '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
- '4ff559f2bea335d59c4012048983ca91'
- '97e193f050574dd272a38e5ee5ebe62b'
- '3c08ad30b89add47d3f45121200a5360'
- '7d9823507206de9b8528a72af2f18d74'
- '07c5f6d86c4b7839d719c8ee0c53653b'
- '7e9483b1069a54f181546083ac7e5469'
- 'c159d683ba1947290fc2ad2c64194150'
- 'bc9efed88e0469cd7fc460d5a5cd7b4b'
- '8538dba8686d7449cb481c9bae9d722a'
- '545c925b46f2ac95e5f8ae407fad101a'
- 'f6416f509c2e5460e4dc624e0a57f3c1'
- 'bbfb59dd517c020a23701b480187a355'
- 'efacfdb61918286ea9bc89866b8fd239'
- '7c3eb09995e8bafeef414374e44ad4ce'
- 'a49ed3ab6bd0fb084de0ab3dd97ae93e'
- '6b432b3305ed446125eef052c38355a6'
- 'a70022a468bd3e9daf01818d2d74ac3c'
- '6b432b3305ed446125eef052c38355a6'
- 'a70022a468bd3e9daf01818d2d74ac3c'
- 'a70022a468bd3e9daf01818d2d74ac3c'
- '380eb2ab6cad3da198094585853c129c'
- 'a60bb9a98abcc3c34156f9051d00df9a'
- '3a908ef6952bcf987e63ef2fe4e98d24'
- '02e87c39c353634cecacf98f1707fa15'
- '0cf41a41e7a415d404d5584e047fd450'
- '449cde3b58390284b59c5d663de3edc9'
- 'c7951fe6888d939f3a7d0dafe477e82b'
- '4da8eeb2ece7e475fc7a0d1003da26c6'
- '5e4187af59726d71c5be48d0cd816c34'
- 'a9e4724b56ddf99bb2e9a8fab8ad43ba'
- '1e47d90affabfbf6dbb07d9d42742d6a')
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 47857e05d..ac0a840e3 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,12 +1,73 @@
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-07-25 14:51:03.569003667 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-07-25 14:51:03.652333615 -0300
-@@ -44,94 +44,38 @@
- * first matching string found, will be used. */
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-09-19 01:30:56.328334913 -0300
+@@ -44,99 +44,111 @@
+
static const osTypePattern gs_OSTypePattern[] =
{
+- /* DOS: */
- { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
++
++ /* Code names for GNU/Linux distributions */
++ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
++ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
++ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
++ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
++ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "GNULinux" },
++
++ /* Regular names of GNU/Linux distributions and GNU-Hurd */
++ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
++ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
++ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
++ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
++ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
++ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
++ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
++ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
++ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
++ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
++ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
++ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
++ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
++ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
++ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
++ { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" },
++ { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("Arc.*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("Arc", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("Deb.*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("Deb", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("Fe.*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("Fe", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("Tur.*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("Tur", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("Ub.*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("Ub", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("Xa.*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("Xa", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "GNULinux_64" },
++ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("Knoppix", Qt::CaseInsensitive), "GNULinux" },
++ { QRegExp("Dsl", Qt::CaseInsensitive), "GNULinux" },
-- /* Windows */
+- /* Windows: */
- { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
- { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
- { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
@@ -27,20 +88,21 @@
- { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
- { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
-
-- /* Solaris */
-- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*1[01])|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
-- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*1[01])|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
+- /* Solaris: */
+- { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
+- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
+- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
- { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
- { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
-
-- /* OS/2 */
+- /* OS/2: */
- { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
- { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
- { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
- { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
- { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
-
-- /* Code names for Linux distributions */
+- /* Code names for Linux distributions: */
- { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
- { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
- { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
@@ -48,7 +110,7 @@
- { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
- { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
-
-- /* Regular names of Linux distributions */
+- /* Regular names of Linux distributions: */
- { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
- { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
- { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
@@ -59,8 +121,8 @@
- { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
- { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
- { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
-- { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
-- { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
+- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
+- { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
- { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
- { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
- { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
@@ -71,6 +133,8 @@
- { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
- { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
- { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
+- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
+- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
- { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
- { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
- { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
@@ -78,37 +142,8 @@
- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
-+ /* Code names for GNU/Linux distributions */
-+ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
-+ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
-+ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
-+ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
-+ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
-+
-+ /* Regular names of GNU/Linux distributions and GNU-Hurd */
-+ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
-+ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
-+ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
-+ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
-+ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
-+ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
-+ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
-+ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
-+ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
-+ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
-+ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
-+ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
-+ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
-+ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
-+ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
-+ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
-+ { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" },
-+ { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+ { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "GNULinux" },
-
- /* Other */
+-
+- /* Other: */
- { QRegExp("L4", Qt::CaseInsensitive), "L4" },
- { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
- { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
@@ -121,9 +156,53 @@
- { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
- { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
- { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
++ /* Other */
{ QRegExp("Ot", Qt::CaseInsensitive), "Other" },
++ { QRegExp("DOS", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Wi.*95", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Wi.*Me", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Wi.*3", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Wi", Qt::CaseInsensitive), "Other" },
++ { QRegExp("So.*11", Qt::CaseInsensitive), "Other" },
++ { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("So.*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("So", Qt::CaseInsensitive), "Other" },
++ { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "Other" },
++ { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "Other" },
++ { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "Other" },
++ { QRegExp("L4", Qt::CaseInsensitive), "Other" },
++ { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Op.*B", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Ne.*B", Qt::CaseInsensitive), "Other" },
++ { QRegExp("QN", Qt::CaseInsensitive), "Other" },
++ { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "Other" },
++ { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Net", Qt::CaseInsensitive), "Other" },
++ { QRegExp("Rocki", Qt::CaseInsensitive), "Other" },
};
+ UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup)
--- VirtualBox-4.1.18.orig/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.498764160 -0300
+++ VirtualBox-4.1.18/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.548761649 -0300
@@ -3227,40 +3227,18 @@
@@ -234,546 +313,460 @@
</xsl:choose>
</xsl:attribute>
<xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
---- VirtualBox-4.1.18.orig/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2012-07-25 15:04:37.856003691 -0300
-+++ VirtualBox-4.1.18/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2012-07-25 15:04:37.892668156 -0300
-@@ -137,75 +137,27 @@
- <xsd:simpleType name="TGuestOSType">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Other"/>
-- <xsd:enumeration value="DOS"/>
-- <xsd:enumeration value="Netware"/>
-- <xsd:enumeration value="L4"/>
-- <xsd:enumeration value="Windows31"/>
-- <xsd:enumeration value="Windows95"/>
-- <xsd:enumeration value="Windows98"/>
-- <xsd:enumeration value="WindowsMe"/>
-- <xsd:enumeration value="WindowsNT4"/>
-- <xsd:enumeration value="Windows2000"/>
-- <xsd:enumeration value="WindowsXP"/>
-- <xsd:enumeration value="WindowsXP_64"/>
-- <xsd:enumeration value="Windows2003"/>
-- <xsd:enumeration value="Windows2003_64"/>
-- <xsd:enumeration value="WindowsVista"/>
-- <xsd:enumeration value="WindowsVista_64"/>
-- <xsd:enumeration value="Windows2008"/>
-- <xsd:enumeration value="Windows2008_64"/>
-- <xsd:enumeration value="Windows7"/>
-- <xsd:enumeration value="Windows7_64"/>
-- <xsd:enumeration value="Windows8"/>
-- <xsd:enumeration value="Windows8_64"/>
-- <xsd:enumeration value="WindowsNT"/>
-- <xsd:enumeration value="OS2Warp3"/>
-- <xsd:enumeration value="OS2Warp4"/>
-- <xsd:enumeration value="OS2Warp45"/>
-- <xsd:enumeration value="OS2eCS"/>
-- <xsd:enumeration value="OS2"/>
-- <xsd:enumeration value="Linux22"/>
-- <xsd:enumeration value="Linux24"/>
-- <xsd:enumeration value="Linux24_64"/>
-- <xsd:enumeration value="Linux26"/>
-- <xsd:enumeration value="Linux26_64"/>
-- <xsd:enumeration value="ArchLinux"/>
-- <xsd:enumeration value="ArchLinux_64"/>
-- <xsd:enumeration value="Debian"/>
-- <xsd:enumeration value="Debian_64"/>
-- <xsd:enumeration value="OpenSUSE"/>
-- <xsd:enumeration value="OpenSUSE_64"/>
-- <xsd:enumeration value="Fedora"/>
-- <xsd:enumeration value="Fedora_64"/>
-- <xsd:enumeration value="Gentoo"/>
-- <xsd:enumeration value="Gentoo_64"/>
-- <xsd:enumeration value="Mandriva"/>
-- <xsd:enumeration value="Mandriva_64"/>
-- <xsd:enumeration value="RedHat"/>
-- <xsd:enumeration value="RedHat_64"/>
-- <xsd:enumeration value="Turbolinux"/>
-- <xsd:enumeration value="Turbolinux_64"/>
-- <xsd:enumeration value="Ubuntu"/>
-- <xsd:enumeration value="Ubuntu_64"/>
-- <xsd:enumeration value="Xandros"/>
-- <xsd:enumeration value="Xandros_64"/>
-- <xsd:enumeration value="Oracle"/>
-- <xsd:enumeration value="Oracle_64"/>
-- <xsd:enumeration value="Linux"/>
-- <xsd:enumeration value="FreeBSD"/>
-- <xsd:enumeration value="FreeBSD_64"/>
-- <xsd:enumeration value="OpenBSD"/>
-- <xsd:enumeration value="OpenBSD_64"/>
-- <xsd:enumeration value="NetBSD"/>
-- <xsd:enumeration value="NetBSD_64"/>
-- <xsd:enumeration value="Solaris"/>
-- <xsd:enumeration value="Solaris_64"/>
-- <xsd:enumeration value="OpenSolaris"/>
-- <xsd:enumeration value="OpenSolaris_64"/>
-- <xsd:enumeration value="QNX"/>
-- <xsd:enumeration value="MacOS"/>
-- <xsd:enumeration value="MacOS_64"/>
-- <xsd:enumeration value="JRockitVE"/>
-+ <xsd:enumeration value="GNU"/>
-+ <xsd:enumeration value="GNU_64"/>
-+ <xsd:enumeration value="GNUHurd"/>
-+ <xsd:enumeration value="GNULinux"/>
-+ <xsd:enumeration value="GNULinux_64"/>
-+ <xsd:enumeration value="Parabola"/>
-+ <xsd:enumeration value="Parabola_64"/>
-+ <xsd:enumeration value="gNewSense"/>
-+ <xsd:enumeration value="gNewSense_64"/>
-+ <xsd:enumeration value="Blag"/>
-+ <xsd:enumeration value="Blag_64"/>
-+ <xsd:enumeration value="Dragora"/>
-+ <xsd:enumeration value="Dragora_64"/>
-+ <xsd:enumeration value="Ututo"/>
-+ <xsd:enumeration value="Ututo_64"/>
-+ <xsd:enumeration value="Musix"/>
-+ <xsd:enumeration value="Musix_64"/>
-+ <xsd:enumeration value="Trisquel"/>
-+ <xsd:enumeration value="Trisquel_64"/>
-+ <xsd:enumeration value="Dynebolic"/>
-+ <xsd:enumeration value="Venenux"/>
- </xsd:restriction>
- </xsd:simpleType>
-
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-25 15:40:56.733096866 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-25 15:40:56.796426519 -0300
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 01:52:44.572133271 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 01:58:47.789130085 -0300
@@ -1,75 +1,27 @@
- <!DOCTYPE RCC><RCC version="1.0">
- <qresource prefix="/">
-- <file alias="os_archlinux.png">images/os_archlinux.png</file>
-- <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file>
-- <file alias="os_debian.png">images/os_debian.png</file>
-- <file alias="os_debian_64.png">images/os_debian_64.png</file>
-- <file alias="os_dos.png">images/os_dos.png</file>
-- <file alias="os_fedora.png">images/os_fedora.png</file>
-- <file alias="os_fedora_64.png">images/os_fedora_64.png</file>
-- <file alias="os_freebsd.png">images/os_freebsd.png</file>
-- <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>
-- <file alias="os_gentoo.png">images/os_gentoo.png</file>
-- <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file>
-- <file alias="os_jrockitve.png">images/os_jrockitve.png</file>
-- <file alias="os_l4.png">images/os_l4.png</file>
-- <file alias="os_linux_other.png">images/os_linux_other.png</file>
-- <file alias="os_linux22.png">images/os_linux22.png</file>
-- <file alias="os_linux24.png">images/os_linux24.png</file>
-- <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
-- <file alias="os_linux26.png">images/os_linux26.png</file>
-- <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
-- <file alias="os_mandriva.png">images/os_mandriva.png</file>
-- <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
-- <file alias="os_netbsd.png">images/os_netbsd.png</file>
-- <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
-- <file alias="os_netware.png">images/os_netware.png</file>
-- <file alias="os_openbsd.png">images/os_openbsd.png</file>
-- <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
-- <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file>
-- <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file>
-- <file alias="os_opensuse.png">images/os_opensuse.png</file>
-- <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
-- <file alias="os_os2_other.png">images/os_os2_other.png</file>
-- <file alias="os_os2ecs.png">images/os_os2ecs.png</file>
-- <file alias="os_os2warp3.png">images/os_os2warp3.png</file>
-- <file alias="os_os2warp4.png">images/os_os2warp4.png</file>
-- <file alias="os_os2warp45.png">images/os_os2warp45.png</file>
-+ <file alias="os_parabola.png">images/os_parabola.png</file>
-+ <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
-+ <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
-+ <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
-+ <file alias="os_blag.png">images/os_blag.png</file>
-+ <file alias="os_blag_64.png">images/os_blag_64.png</file>
-+ <file alias="os_ututo.png">images/os_ututo.png</file>
-+ <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
-+ <file alias="os_gnu.png">images/os_gnu.png</file>
-+ <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
-+ <file alias="os_gnuhurd.png">images/os_gnuhurd.png</file>
-+ <file alias="os_gnulinux.png">images/os_gnulinux.png</file>
-+ <file alias="os_gnulinux_64.png">images/os_gnulinux_64.png</file>
-+ <file alias="os_musix.png">images/os_musix.png</file>
-+ <file alias="os_musix_64.png">images/os_musix_64.png</file>
-+ <file alias="os_dragora.png">images/os_dragora.png</file>
-+ <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
- <file alias="os_other.png">images/os_other.png</file>
-- <file alias="os_qnx.png">images/os_qnx.png</file>
-- <file alias="os_redhat.png">images/os_redhat.png</file>
-- <file alias="os_redhat_64.png">images/os_redhat_64.png</file>
-- <file alias="os_turbolinux.png">images/os_turbolinux.png</file>
-- <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file>
-- <file alias="os_solaris.png">images/os_solaris.png</file>
-- <file alias="os_solaris_64.png">images/os_solaris_64.png</file>
-- <file alias="os_ubuntu.png">images/os_ubuntu.png</file>
-- <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file>
-- <file alias="os_win_other.png">images/os_win_other.png</file>
-- <file alias="os_win2k.png">images/os_win2k.png</file>
-- <file alias="os_win2k3.png">images/os_win2k3.png</file>
-- <file alias="os_win2k3_64.png">images/os_win2k3_64.png</file>
-- <file alias="os_win2k8.png">images/os_win2k8.png</file>
-- <file alias="os_win2k8_64.png">images/os_win2k8_64.png</file>
-- <file alias="os_win31.png">images/os_win31.png</file>
-- <file alias="os_win7.png">images/os_win7.png</file>
-- <file alias="os_win7_64.png">images/os_win7_64.png</file>
-- <file alias="os_win8.png">images/os_win8.png</file>
-- <file alias="os_win8_64.png">images/os_win8_64.png</file>
-- <file alias="os_win95.png">images/os_win95.png</file>
-- <file alias="os_win98.png">images/os_win98.png</file>
-- <file alias="os_winme.png">images/os_winme.png</file>
-- <file alias="os_winnt4.png">images/os_winnt4.png</file>
-- <file alias="os_winvista.png">images/os_winvista.png</file>
-- <file alias="os_winvista_64.png">images/os_winvista_64.png</file>
-- <file alias="os_winxp.png">images/os_winxp.png</file>
-- <file alias="os_winxp_64.png">images/os_winxp_64.png</file>
-- <file alias="os_xandros.png">images/os_xandros.png</file>
-- <file alias="os_xandros_64.png">images/os_xandros_64.png</file>
-- <file alias="os_oracle.png">images/os_oracle.png</file>
-- <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
-- <file alias="os_macosx.png">images/os_macosx.png</file>
-- <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
-+ <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
-+ <file alias="os_venenux.png">images/os_venenux.png</file>
-+ <file alias="os_trisquel.png">images/os_trisquel.png</file>
-+ <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
- <file alias="hd_16px.png">images/hd_16px.png</file>
- <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
- <file alias="hd_32px.png">images/hd_32px.png</file>
---- VirtualBox-4.1.20.orig/src/VBox/Main/src-all/Global.cpp 2012-08-20 11:36:24.000000000 -0300
-+++ VirtualBox-4.1.20/src/VBox/Main/src-all/Global.cpp 2012-08-21 14:22:29.148190849 -0300
-@@ -35,284 +35,90 @@
+ <RCC>
+ <qresource prefix="/">
+- <file alias="os_archlinux.png">images/os_archlinux.png</file>
+- <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file>
+- <file alias="os_debian.png">images/os_debian.png</file>
+- <file alias="os_debian_64.png">images/os_debian_64.png</file>
+- <file alias="os_dos.png">images/os_dos.png</file>
+- <file alias="os_fedora.png">images/os_fedora.png</file>
+- <file alias="os_fedora_64.png">images/os_fedora_64.png</file>
+- <file alias="os_freebsd.png">images/os_freebsd.png</file>
+- <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>
+- <file alias="os_gentoo.png">images/os_gentoo.png</file>
+- <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file>
+- <file alias="os_jrockitve.png">images/os_jrockitve.png</file>
+- <file alias="os_l4.png">images/os_l4.png</file>
+- <file alias="os_linux_other.png">images/os_linux_other.png</file>
+- <file alias="os_linux22.png">images/os_linux22.png</file>
+- <file alias="os_linux24.png">images/os_linux24.png</file>
+- <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
+- <file alias="os_linux26.png">images/os_linux26.png</file>
+- <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
+- <file alias="os_mandriva.png">images/os_mandriva.png</file>
+- <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
+- <file alias="os_netbsd.png">images/os_netbsd.png</file>
+- <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
+- <file alias="os_netware.png">images/os_netware.png</file>
+- <file alias="os_openbsd.png">images/os_openbsd.png</file>
+- <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
+- <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file>
+- <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file>
+- <file alias="os_opensuse.png">images/os_opensuse.png</file>
+- <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
+- <file alias="os_os2_other.png">images/os_os2_other.png</file>
+- <file alias="os_os2ecs.png">images/os_os2ecs.png</file>
+- <file alias="os_os2warp3.png">images/os_os2warp3.png</file>
+- <file alias="os_os2warp4.png">images/os_os2warp4.png</file>
+- <file alias="os_os2warp45.png">images/os_os2warp45.png</file>
+ <file alias="os_other.png">images/os_other.png</file>
+- <file alias="os_qnx.png">images/os_qnx.png</file>
+- <file alias="os_redhat.png">images/os_redhat.png</file>
+- <file alias="os_redhat_64.png">images/os_redhat_64.png</file>
+- <file alias="os_turbolinux.png">images/os_turbolinux.png</file>
+- <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file>
+- <file alias="os_solaris.png">images/os_solaris.png</file>
+- <file alias="os_solaris_64.png">images/os_solaris_64.png</file>
+- <file alias="os_ubuntu.png">images/os_ubuntu.png</file>
+- <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file>
+- <file alias="os_win_other.png">images/os_win_other.png</file>
+- <file alias="os_win2k.png">images/os_win2k.png</file>
+- <file alias="os_win2k3.png">images/os_win2k3.png</file>
+- <file alias="os_win2k3_64.png">images/os_win2k3_64.png</file>
+- <file alias="os_win2k8.png">images/os_win2k8.png</file>
+- <file alias="os_win2k8_64.png">images/os_win2k8_64.png</file>
+- <file alias="os_win31.png">images/os_win31.png</file>
+- <file alias="os_win7.png">images/os_win7.png</file>
+- <file alias="os_win7_64.png">images/os_win7_64.png</file>
+- <file alias="os_win8.png">images/os_win8.png</file>
+- <file alias="os_win8_64.png">images/os_win8_64.png</file>
+- <file alias="os_win95.png">images/os_win95.png</file>
+- <file alias="os_win98.png">images/os_win98.png</file>
+- <file alias="os_winme.png">images/os_winme.png</file>
+- <file alias="os_winnt4.png">images/os_winnt4.png</file>
+- <file alias="os_winvista.png">images/os_winvista.png</file>
+- <file alias="os_winvista_64.png">images/os_winvista_64.png</file>
+- <file alias="os_winxp.png">images/os_winxp.png</file>
+- <file alias="os_winxp_64.png">images/os_winxp_64.png</file>
+- <file alias="os_xandros.png">images/os_xandros.png</file>
+- <file alias="os_xandros_64.png">images/os_xandros_64.png</file>
+- <file alias="os_oracle.png">images/os_oracle.png</file>
+- <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
+- <file alias="os_macosx.png">images/os_macosx.png</file>
+- <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
++ <file alias="os_parabola.png">images/os_parabola.png</file>
++ <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
++ <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
++ <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
++ <file alias="os_blag.png">images/os_blag.png</file>
++ <file alias="os_blag_64.png">images/os_blag_64.png</file>
++ <file alias="os_ututo.png">images/os_ututo.png</file>
++ <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
++ <file alias="os_gnu.png">images/os_gnu.png</file>
++ <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
++ <file alias="os_gnuhurd.png">images/os_gnuhurd.png</file>
++ <file alias="os_gnulinux.png">images/os_gnulinux.png</file>
++ <file alias="os_gnulinux_64.png">images/os_gnulinux_64.png</file>
++ <file alias="os_musix.png">images/os_musix.png</file>
++ <file alias="os_musix_64.png">images/os_musix_64.png</file>
++ <file alias="os_dragora.png">images/os_dragora.png</file>
++ <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
++ <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
++ <file alias="os_venenux.png">images/os_venenux.png</file>
++ <file alias="os_trisquel.png">images/os_trisquel.png</file>
++ <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
+ <file alias="hd_16px.png">images/hd_16px.png</file>
+ <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
+ <file alias="hd_32px.png">images/hd_32px.png</file>
+--- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-09-19 03:33:50.143066084 -0300
+@@ -29,296 +29,94 @@
+ /* NOTE1: we assume that unknown is always the first entry!
+ * NOTE2: please use powers of 2 when specifying the size of harddisks since
+ * '2GB' looks better than '1.95GB' (= 2000MB) */
+- { "Other", "Other", "Other", "Other/Unknown",
++ { "Other", "Other", "Other", "Other/Unknown",
VBOXOSTYPE_Unknown, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows31, "Windows 3.1",
-- VBOXOSTYPE_Win31, VBOXOSHINT_NONE,
+- { "Windows", "Microsoft Windows", "Windows31", "Windows 3.1",
+- VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY,
- 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows95, "Windows 95",
-- VBOXOSTYPE_Win95, VBOXOSHINT_NONE,
+- { "Windows", "Microsoft Windows", "Windows95", "Windows 95",
+- VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY,
- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows98, "Windows 98",
-- VBOXOSTYPE_Win98, VBOXOSHINT_NONE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "Windows", "Microsoft Windows", "Windows98", "Windows 98",
+- VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY,
- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "Windows", "Microsoft Windows", "WindowsMe", "Windows ME",
+- VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
+- 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsMe, "Windows Me",
-- VBOXOSTYPE_WinMe, VBOXOSHINT_NONE,
-- 64, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT4, "Windows NT 4",
+- { "Windows", "Microsoft Windows", "WindowsNT4", "Windows NT 4",
- VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE,
- 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2000, "Windows 2000",
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "Windows", "Microsoft Windows", "Windows2000", "Windows 2000",
- VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET,
- 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP, "Windows XP",
+- { "Windows", "Microsoft Windows", "WindowsXP", "Windows XP",
- VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET,
- 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP_64, "Windows XP (64 bit)",
+- { "Windows", "Microsoft Windows", "WindowsXP_64", "Windows XP (64 bit)",
- VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
- 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003, "Windows 2003",
+- { "Windows", "Microsoft Windows", "Windows2003", "Windows 2003",
- VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET,
- 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003_64, "Windows 2003 (64 bit)",
+- { "Windows", "Microsoft Windows", "Windows2003_64", "Windows 2003 (64 bit)",
- VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
- 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista, "Windows Vista",
+- { "Windows", "Microsoft Windows", "WindowsVista", "Windows Vista",
- VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET,
- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista_64, "Windows Vista (64 bit)",
+- { "Windows", "Microsoft Windows", "WindowsVista_64", "Windows Vista (64 bit)",
- VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008, "Windows 2008",
+- { "Windows", "Microsoft Windows", "Windows2008", "Windows 2008",
- VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET,
- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008_64, "Windows 2008 (64 bit)",
+- { "Windows", "Microsoft Windows", "Windows2008_64", "Windows 2008 (64 bit)",
- VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7, "Windows 7",
+- { "Windows", "Microsoft Windows", "Windows7", "Windows 7",
- VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET,
- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7_64, "Windows 7 (64 bit)",
+- { "Windows", "Microsoft Windows", "Windows7_64", "Windows 7 (64 bit)",
- VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
- 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8, "Windows 8",
-- VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
+- { "Windows", "Microsoft Windows", "Windows8", "Windows 8",
+- VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
- 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8_64, "Windows 8 (64 bit)",
+- { "Windows", "Microsoft Windows", "Windows8_64", "Windows 8 (64 bit)",
- VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-- 1536,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
+- { "Windows", "Microsoft Windows", "Windows2012_64", "Windows 2012 (64 bit)",
+- VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA },
-- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT, "Other Windows",
+- { "Windows", "Microsoft Windows", "WindowsNT", "Other Windows",
- VBOXOSTYPE_WinNT, VBOXOSHINT_NONE,
- 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux22, "Linux 2.2",
+- { "Linux", "Linux", "Linux22", "Linux 2.2",
- VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC,
- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24, "Linux 2.4",
+- { "Linux", "Linux", "Linux24", "Linux 2.4",
- VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC,
- 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24_64, "Linux 2.4 (64 bit)",
+- { "Linux", "Linux", "Linux24_64", "Linux 2.4 (64 bit)",
- VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
- 128, 4, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ { "GNU", "GNU", SchemaDefs_OSTypeId_GNU, "GNU",
++ { "GNU", "GNU", "GNU", "GNU",
+ VBOXOSTYPE_GNU, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "GNU", "GNU", SchemaDefs_OSTypeId_GNU_64, "GNU (64 bit)",
++ { "GNU", "GNU", "GNU_64", "GNU (64 bit)",
+ VBOXOSTYPE_GNU_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "GNU-Hurd", "GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd, "GNU-Hurd",
++ { "GNU-Hurd", "GNU-Hurd", "GNUHurd", "GNU-Hurd",
+ VBOXOSTYPE_GNUHurd, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26, "Linux 2.6",
+- { "Linux", "Linux", "Linux26", "Linux 2.6",
- VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_GNULinux, "GNU/Linux",
++ { "GNU/Linux", "GNU/Linux", "GNULinux", "GNU/Linux",
+ VBOXOSTYPE_GNULinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26_64, "Linux 2.6 (64 bit)",
+- { "Linux", "Linux", "Linux26_64", "Linux 2.6 (64 bit)",
- VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_GNULinux_64, "GNU/Linux (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "GNULinux_64", "GNU/Linux (64 bit)",
+ VBOXOSTYPE_GNULinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux, "Arch Linux",
+- { "Linux", "Linux", "ArchLinux", "Arch Linux",
- VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Parabola, "Parabola GNU/Linux-libre",
++ { "GNU/Linux", "GNU/Linux", "Parabola", "Parabola GNU/Linux-libre",
+ VBOXOSTYPE_Parabola, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux_64, "Arch Linux (64 bit)",
+- { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64 bit)",
- VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Parabola_64, "Parabola GNU/Linux-libre (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "Parabola_64", "Parabola GNU/Linux-libre (64 bit)",
+ VBOXOSTYPE_Parabola_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Debian, "Debian",
+- { "Linux", "Linux", "Debian", "Debian",
- VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_gNewSense, "gNewSense",
++ { "GNU/Linux", "GNU/Linux", "gNewSense", "gNewSense",
+ VBOXOSTYPE_gNewSense, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Debian_64, "Debian (64 bit)",
+- { "Linux", "Linux", "Debian_64", "Debian (64 bit)",
- VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_gNewSense_64, "gNewSense (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "gNewSense_64", "gNewSense (64 bit)",
+ VBOXOSTYPE_gNewSense_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-- { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE, "openSUSE",
+- { "Linux", "Linux", "OpenSUSE", "openSUSE",
- VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE_64, "openSUSE (64 bit)",
+- { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64 bit)",
- VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora, "Fedora",
+- { "Linux", "Linux", "Fedora", "Fedora",
- VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Blag, "Blag Linux and GNU",
++ { "GNU/Linux", "GNU/Linux", "Blag", "Blag Linux and GNU",
+ VBOXOSTYPE_Blag, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora_64, "Fedora (64 bit)",
+- { "Linux", "Linux", "Fedora_64", "Fedora (64 bit)",
- VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Blag_64, "Blag Linux and GNU (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "Blag_64", "Blag Linux and GNU (64 bit)",
+ VBOXOSTYPE_Blag_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo, "Gentoo",
+- { "Linux", "Linux", "Gentoo", "Gentoo",
- VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dragora, "Dragora",
++ { "GNU/Linux", "GNU/Linux", "Dragora", "Dragora",
+ VBOXOSTYPE_Dragora, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo_64, "Gentoo (64 bit)",
+- { "Linux", "Linux", "Gentoo_64", "Gentoo (64 bit)",
- VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dragora_64, "Dragora (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "Dragora_64", "Dragora (64 bit)",
+ VBOXOSTYPE_Dragora_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva, "Mandriva",
+- { "Linux", "Linux", "Mandriva", "Mandriva",
- VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva_64, "Mandriva (64 bit)",
+- { "Linux", "Linux", "Mandriva_64", "Mandriva (64 bit)",
- VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat, "Red Hat",
+- { "Linux", "Linux", "RedHat", "Red Hat",
- VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Ututo, "Ututo XS",
++ { "GNU/Linux", "GNU/Linux", "Ututo", "Ututo XS",
+ VBOXOSTYPE_Ututo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat_64, "Red Hat (64 bit)",
+- { "Linux", "Linux", "RedHat_64", "Red Hat (64 bit)",
- VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
- 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Ututo_64, "Ututo XS (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "Ututo_64", "Ututo XS (64 bit)",
+ VBOXOSTYPE_Ututo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux",
+- { "Linux", "Linux", "Turbolinux", "Turbolinux",
- VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Musix, "Musix",
++ { "GNU/Linux", "GNU/Linux", "Musix", "Musix",
+ VBOXOSTYPE_Musix, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux (64 bit)",
+- { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64 bit)",
- VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Musix_64, "Musix (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "Musix_64", "Musix (64 bit)",
+ VBOXOSTYPE_Musix_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu, "Ubuntu",
+- { "Linux", "Linux", "Ubuntu", "Ubuntu",
- VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Trisquel, "Trisquel",
++ { "GNU/Linux", "GNU/Linux", "Trisquel", "Trisquel",
+ VBOXOSTYPE_Trisquel, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu_64, "Ubuntu (64 bit)",
+- { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64 bit)",
- VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Trisquel_64, "Trisquel (64 bit)",
++ { "GNU/Linux", "GNU/Linux", "Trisquel_64", "Trisquel (64 bit)",
+ VBOXOSTYPE_Trisquel_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros, "Xandros",
+- { "Linux", "Linux", "Xandros", "Xandros",
- VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC,
- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dynebolic, "Dyne:bolic",
++ { "GNU/Linux", "GNU/Linux", "Dynebolic", "Dyne:bolic",
+ VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)",
+- { "Linux", "Linux", "Xandros_64", "Xandros (64 bit)",
- VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
- 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Venenux, "Venenux",
++ { "GNU/Linux", "GNU/Linux", "Venenux", "Venenux",
+ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle",
+- { "Linux", "Linux", "Oracle", "Oracle",
- VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)",
+- { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)",
- VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
- 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux",
+- { "Linux", "Linux", "Linux", "Other Linux",
- VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
- 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris, "Oracle Solaris 10 5/09 and earlier",
+- { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier",
- VBOXOSTYPE_Solaris, VBOXOSHINT_NONE,
- 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris_64, "Oracle Solaris 10 5/09 and earlier (64 bit)",
+- { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)",
- VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris, "Oracle Solaris 10 10/09 and later",
+- { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later",
- VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET,
- 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris_64, "Oracle Solaris 10 10/09 and later (64 bit)",
+- { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)",
- VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD, "FreeBSD",
+- { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)",
+- VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+- { "BSD", "BSD", "FreeBSD", "FreeBSD",
- VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE,
- 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD_64, "FreeBSD (64 bit)",
+- { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)",
- VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
- 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD, "OpenBSD",
+- { "BSD", "BSD", "OpenBSD", "OpenBSD",
- VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX,
- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD_64, "OpenBSD (64 bit)",
+- { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)",
- VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD, "NetBSD",
+- { "BSD", "BSD", "NetBSD", "NetBSD",
- VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE,
- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD_64, "NetBSD (64 bit)",
+- { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)",
- VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
- 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp3, "OS/2 Warp 3",
-- VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX,
+- { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3",
+- VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
- 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp4, "OS/2 Warp 4",
-- VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4",
+- VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp45, "OS/2 Warp 4.5",
-- VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX,
-- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2eCS, "eComStation",
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5",
+- VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
+- 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "OS2", "IBM OS/2", "OS2eCS", "eComStation",
- VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX,
-- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+- 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2, "Other OS/2",
-- VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX,
+- { "OS2", "IBM OS/2", "OS2", "Other OS/2",
+- VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS, "Mac OS X Server",
+- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
+- { "MacOS", "Mac OS X", "MacOS", "Mac OS X",
- VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-- 1024, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
+- 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
- StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
- ChipsetType_ICH9, AudioControllerType_HDA },
-- { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS_64, "Mac OS X Server (64 bit)",
+- { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)",
- VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-- 1024, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
+- 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
- StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
- ChipsetType_ICH9, AudioControllerType_HDA },
-- { "Other", "Other", SchemaDefs_OSTypeId_DOS, "DOS",
-- VBOXOSTYPE_DOS, VBOXOSHINT_NONE,
+- { "Other", "Other", "DOS", "DOS",
+- VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
- 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
-- { "Other", "Other", SchemaDefs_OSTypeId_Netware, "Netware",
+- { "Other", "Other", "Netware", "Netware",
- VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX,
- 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Other", "Other", SchemaDefs_OSTypeId_L4, "L4",
+- { "Other", "Other", "L4", "L4",
- VBOXOSTYPE_L4, VBOXOSHINT_NONE,
- 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Other", "Other", SchemaDefs_OSTypeId_QNX, "QNX",
+- { "Other", "Other", "QNX", "QNX",
- VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX,
- 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
-- { "Other", "Other", SchemaDefs_OSTypeId_JRockitVE, "JRockitVE",
+- { "Other", "Other", "JRockitVE", "JRockitVE",
- VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
- 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
- StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
};
- /**
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-07-25 21:44:01.290876720 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-07-25 22:00:57.819380802 -0300
-@@ -4875,75 +4875,27 @@
+ uint32_t Global::cOSTypes = RT_ELEMENTS(Global::sOSTypes);
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-04 09:48:45.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-19 02:10:41.293426675 -0300
+@@ -4283,76 +4283,27 @@
static const char *kOSTypeIcons [][2] =
{
{"Other", ":/os_other.png"},
@@ -842,6 +835,7 @@
- {"Solaris_64", ":/os_solaris_64.png"},
- {"OpenSolaris", ":/os_oraclesolaris.png"},
- {"OpenSolaris_64", ":/os_oraclesolaris_64.png"},
+- {"Solaris11_64", ":/os_oraclesolaris_64.png"},
- {"QNX", ":/os_qnx.png"},
- {"MacOS", ":/os_macosx.png"},
- {"MacOS_64", ":/os_macosx_64.png"},
@@ -870,32 +864,9 @@
};
for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
{
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp.orig 2012-06-20 10:16:38.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2012-07-25 22:07:51.232436783 -0300
-@@ -192,17 +192,10 @@
- if (typeIndex != -1)
- mCbType->setCurrentIndex (typeIndex);
- }
-- /* Or select WinXP item for Windows family as default */
-- else if (familyId == "Windows")
-+ /* Or select Parabola GNU/Linux-libre item for GNU/Linux family as default */
-+ else if (familyId == "GNU/Linux")
- {
-- int xpIndex = mCbType->findData ("WindowsXP", RoleTypeID);
-- if (xpIndex != -1)
-- mCbType->setCurrentIndex (xpIndex);
-- }
-- /* Or select Ubuntu item for Linux family as default */
-- else if (familyId == "Linux")
-- {
-- int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID);
-+ int ubIndex = mCbType->findData ("Parabola", RoleTypeID);
- if (ubIndex != -1)
- mCbType->setCurrentIndex (ubIndex);
- }
---- VirtualBox-4.1.18.orig/include/VBox/ostypes.h 2012-06-20 10:07:51.000000000 -0300
-+++ VirtualBox-4.1.18/include/VBox/ostypes.h 2012-07-25 23:20:57.322757456 -0300
-@@ -43,77 +43,27 @@
+--- VirtualBox-4.2.0.orig/include/VBox/ostypes.h 2012-09-08 06:35:56.000000000 -0300
++++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-09-19 02:20:24.640916587 -0300
+@@ -43,79 +43,27 @@
typedef enum VBOXOSTYPE
{
VBOXOSTYPE_Unknown = 0,
@@ -920,6 +891,7 @@
- VBOXOSTYPE_Win7_x64 = 0x37100,
- VBOXOSTYPE_Win8 = 0x38000,
- VBOXOSTYPE_Win8_x64 = 0x38100,
+- VBOXOSTYPE_Win2k12_x64 = 0x39100,
- VBOXOSTYPE_OS2 = 0x40000,
- VBOXOSTYPE_OS2Warp3 = 0x41000,
- VBOXOSTYPE_OS2Warp4 = 0x42000,
@@ -965,6 +937,7 @@
- VBOXOSTYPE_Solaris_x64 = 0x80100,
- VBOXOSTYPE_OpenSolaris = 0x81000,
- VBOXOSTYPE_OpenSolaris_x64 = 0x81100,
+- VBOXOSTYPE_Solaris11_x64 = 0x82100,
- VBOXOSTYPE_L4 = 0x90000,
- VBOXOSTYPE_QNX = 0xA0000,
- VBOXOSTYPE_MacOS = 0xB0000,
@@ -994,7 +967,7 @@
/** The bit number which indicates 64-bit or 32-bit. */
#define VBOXOSTYPE_x64_BIT 8
/** The mask which indicates 64-bit. */
-@@ -129,16 +79,11 @@
+@@ -131,16 +79,11 @@
typedef enum VBOXOSFAMILY
{
VBOXOSFAMILY_Unknown = 0,
@@ -1016,100 +989,100 @@
/** The usual 32-bit hack. */
VBOXOSFAMILY_32BIT_HACK = 0x7fffffff
} VBOXOSFAMILY;
---- VirtualBox-4.1.18.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-06-20 10:17:35.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-07-26 01:28:50.033551279 -0300
-@@ -49,94 +49,33 @@
+--- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-08-03 09:28:30.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-09-19 02:28:56.055603266 -0300
+@@ -50,94 +50,33 @@
g_osTypes[] =
{
- { ovf::CIMOSType_CIMOS_Unknown, SchemaDefs_OSTypeId_Other },
-- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2 },
-- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp3 },
-- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp4 },
-- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp45 },
-- { ovf::CIMOSType_CIMOS_MSDOS, SchemaDefs_OSTypeId_DOS },
-- { ovf::CIMOSType_CIMOS_WIN3x, SchemaDefs_OSTypeId_Windows31 },
-- { ovf::CIMOSType_CIMOS_WIN95, SchemaDefs_OSTypeId_Windows95 },
-- { ovf::CIMOSType_CIMOS_WIN98, SchemaDefs_OSTypeId_Windows98 },
-- { ovf::CIMOSType_CIMOS_WINNT, SchemaDefs_OSTypeId_WindowsNT },
-- { ovf::CIMOSType_CIMOS_WINNT, SchemaDefs_OSTypeId_WindowsNT4 },
-- { ovf::CIMOSType_CIMOS_NetWare, SchemaDefs_OSTypeId_Netware },
-- { ovf::CIMOSType_CIMOS_NovellOES, SchemaDefs_OSTypeId_Netware },
-- { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_Solaris },
-- { ovf::CIMOSType_CIMOS_SunOS, SchemaDefs_OSTypeId_Solaris },
-- { ovf::CIMOSType_CIMOS_FreeBSD, SchemaDefs_OSTypeId_FreeBSD },
-- { ovf::CIMOSType_CIMOS_NetBSD, SchemaDefs_OSTypeId_NetBSD },
-- { ovf::CIMOSType_CIMOS_QNX, SchemaDefs_OSTypeId_QNX },
-- { ovf::CIMOSType_CIMOS_Windows2000, SchemaDefs_OSTypeId_Windows2000 },
-- { ovf::CIMOSType_CIMOS_WindowsMe, SchemaDefs_OSTypeId_WindowsMe },
-- { ovf::CIMOSType_CIMOS_OpenBSD, SchemaDefs_OSTypeId_OpenBSD },
-- { ovf::CIMOSType_CIMOS_WindowsXP, SchemaDefs_OSTypeId_WindowsXP },
-- { ovf::CIMOSType_CIMOS_WindowsXPEmbedded, SchemaDefs_OSTypeId_WindowsXP },
-- { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService, SchemaDefs_OSTypeId_WindowsXP },
-- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003, SchemaDefs_OSTypeId_Windows2003 },
-- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64, SchemaDefs_OSTypeId_Windows2003_64 },
-- { ovf::CIMOSType_CIMOS_WindowsXP_64, SchemaDefs_OSTypeId_WindowsXP_64 },
-- { ovf::CIMOSType_CIMOS_WindowsVista, SchemaDefs_OSTypeId_WindowsVista },
-- { ovf::CIMOSType_CIMOS_WindowsVista_64, SchemaDefs_OSTypeId_WindowsVista_64 },
-- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008, SchemaDefs_OSTypeId_Windows2008 },
-- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, SchemaDefs_OSTypeId_Windows2008_64 },
-- { ovf::CIMOSType_CIMOS_FreeBSD_64, SchemaDefs_OSTypeId_FreeBSD_64 },
-- { ovf::CIMOSType_CIMOS_MACOS, SchemaDefs_OSTypeId_MacOS },
-- { ovf::CIMOSType_CIMOS_MACOS, SchemaDefs_OSTypeId_MacOS_64 }, // there is no CIM 64-bit type for this
+ { ovf::CIMOSType_CIMOS_Unknown, VBOXOSTYPE_Unknown },
+- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2 },
+- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp3 },
+- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp4 },
+- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp45 },
+- { ovf::CIMOSType_CIMOS_MSDOS, VBOXOSTYPE_DOS },
+- { ovf::CIMOSType_CIMOS_WIN3x, VBOXOSTYPE_Win31 },
+- { ovf::CIMOSType_CIMOS_WIN95, VBOXOSTYPE_Win95 },
+- { ovf::CIMOSType_CIMOS_WIN98, VBOXOSTYPE_Win98 },
+- { ovf::CIMOSType_CIMOS_WINNT, VBOXOSTYPE_WinNT },
+- { ovf::CIMOSType_CIMOS_WINNT, VBOXOSTYPE_WinNT4 },
+- { ovf::CIMOSType_CIMOS_NetWare, VBOXOSTYPE_Netware },
+- { ovf::CIMOSType_CIMOS_NovellOES, VBOXOSTYPE_Netware },
+- { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_Solaris },
+- { ovf::CIMOSType_CIMOS_SunOS, VBOXOSTYPE_Solaris },
+- { ovf::CIMOSType_CIMOS_FreeBSD, VBOXOSTYPE_FreeBSD },
+- { ovf::CIMOSType_CIMOS_NetBSD, VBOXOSTYPE_NetBSD },
+- { ovf::CIMOSType_CIMOS_QNX, VBOXOSTYPE_QNX },
+- { ovf::CIMOSType_CIMOS_Windows2000, VBOXOSTYPE_Win2k },
+- { ovf::CIMOSType_CIMOS_WindowsMe, VBOXOSTYPE_WinMe },
+- { ovf::CIMOSType_CIMOS_OpenBSD, VBOXOSTYPE_OpenBSD },
+- { ovf::CIMOSType_CIMOS_WindowsXP, VBOXOSTYPE_WinXP },
+- { ovf::CIMOSType_CIMOS_WindowsXPEmbedded, VBOXOSTYPE_WinXP },
+- { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService, VBOXOSTYPE_WinXP },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003, VBOXOSTYPE_Win2k3 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64, VBOXOSTYPE_Win2k3_x64 },
+- { ovf::CIMOSType_CIMOS_WindowsXP_64, VBOXOSTYPE_WinXP_x64 },
+- { ovf::CIMOSType_CIMOS_WindowsVista, VBOXOSTYPE_WinVista },
+- { ovf::CIMOSType_CIMOS_WindowsVista_64, VBOXOSTYPE_WinVista_x64 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008, VBOXOSTYPE_Win2k8 },
+- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, VBOXOSTYPE_Win2k8_x64 },
+- { ovf::CIMOSType_CIMOS_FreeBSD_64, VBOXOSTYPE_FreeBSD_x64 },
+- { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS },
+- { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this
-
- // Linuxes
-- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, SchemaDefs_OSTypeId_RedHat },
-- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, SchemaDefs_OSTypeId_RedHat_64 },
-- { ovf::CIMOSType_CIMOS_Solaris_64, SchemaDefs_OSTypeId_Solaris_64 },
-- { ovf::CIMOSType_CIMOS_SUSE, SchemaDefs_OSTypeId_OpenSUSE },
-- { ovf::CIMOSType_CIMOS_SLES, SchemaDefs_OSTypeId_OpenSUSE },
-- { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, SchemaDefs_OSTypeId_OpenSUSE },
-- { ovf::CIMOSType_CIMOS_SUSE_64, SchemaDefs_OSTypeId_OpenSUSE_64 },
-- { ovf::CIMOSType_CIMOS_SLES_64, SchemaDefs_OSTypeId_OpenSUSE_64 },
-- { ovf::CIMOSType_CIMOS_LINUX, SchemaDefs_OSTypeId_Linux },
-- { ovf::CIMOSType_CIMOS_LINUX, SchemaDefs_OSTypeId_Linux22 },
-- { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, SchemaDefs_OSTypeId_Linux },
-- { ovf::CIMOSType_CIMOS_TurboLinux, SchemaDefs_OSTypeId_Turbolinux },
-- { ovf::CIMOSType_CIMOS_TurboLinux_64, SchemaDefs_OSTypeId_Turbolinux_64 },
-- { ovf::CIMOSType_CIMOS_Mandriva, SchemaDefs_OSTypeId_Mandriva },
-- { ovf::CIMOSType_CIMOS_Mandriva_64, SchemaDefs_OSTypeId_Mandriva_64 },
-- { ovf::CIMOSType_CIMOS_Ubuntu, SchemaDefs_OSTypeId_Ubuntu },
-- { ovf::CIMOSType_CIMOS_Ubuntu_64, SchemaDefs_OSTypeId_Ubuntu_64 },
-- { ovf::CIMOSType_CIMOS_Debian, SchemaDefs_OSTypeId_Debian },
-- { ovf::CIMOSType_CIMOS_Debian_64, SchemaDefs_OSTypeId_Debian_64 },
-- { ovf::CIMOSType_CIMOS_Linux_2_4_x, SchemaDefs_OSTypeId_Linux24 },
-- { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, SchemaDefs_OSTypeId_Linux24_64 },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Linux26 },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Linux26_64 },
-- { ovf::CIMOSType_CIMOS_Linux_64, SchemaDefs_OSTypeId_Linux26_64 },
+- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat },
+- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 },
+- { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 },
+- { ovf::CIMOSType_CIMOS_SUSE, VBOXOSTYPE_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_SLES, VBOXOSTYPE_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, VBOXOSTYPE_OpenSUSE },
+- { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_x64 },
+- { ovf::CIMOSType_CIMOS_SLES_64, VBOXOSTYPE_OpenSUSE_x64 },
+- { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux },
+- { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux22 },
+- { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux },
+- { ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux },
+- { ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 },
+- { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva },
+- { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 },
+- { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu },
+- { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 },
+- { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian },
+- { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 },
+- { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Linux26 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 },
+- { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 },
-
- // types that we have support for but CIM doesn't
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_ArchLinux },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_ArchLinux_64 },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Fedora },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Fedora_64 },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Gentoo },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Gentoo_64 },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Xandros },
-- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Xandros_64 },
-- { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_OpenSolaris },
-- { ovf::CIMOSType_CIMOS_Solaris_64, SchemaDefs_OSTypeId_OpenSolaris_64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_FedoraCore_x64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Gentoo },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Gentoo_x64 },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Xandros },
+- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 },
+- { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris },
+- { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_OpenSolaris_x64 },
-
- // types added with CIM 2.25.0 follow:
-- { ovf::CIMOSType_CIMOS_WindowsServer2008R2, SchemaDefs_OSTypeId_Windows2008 }, // duplicate, see above
--// { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM
-- { ovf::CIMOSType_CIMOS_Windows7, SchemaDefs_OSTypeId_Windows7 },
-- { ovf::CIMOSType_CIMOS_Windows7, SchemaDefs_OSTypeId_Windows7_64 }, // there is no CIM 64-bit type for this
-- { ovf::CIMOSType_CIMOS_CentOS, SchemaDefs_OSTypeId_RedHat },
-- { ovf::CIMOSType_CIMOS_CentOS_64, SchemaDefs_OSTypeId_RedHat_64 },
-- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux, SchemaDefs_OSTypeId_Oracle },
-- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64, SchemaDefs_OSTypeId_Oracle_64 },
-- { ovf::CIMOSType_CIMOS_eComStation, SchemaDefs_OSTypeId_OS2eCS }
+- { ovf::CIMOSType_CIMOS_WindowsServer2008R2, VBOXOSTYPE_Win2k8 }, // duplicate, see above
+-// { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM
+- { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7 },
+- { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7_x64 }, // there is no CIM 64-bit type for this
+- { ovf::CIMOSType_CIMOS_CentOS, VBOXOSTYPE_RedHat },
+- { ovf::CIMOSType_CIMOS_CentOS_64, VBOXOSTYPE_RedHat_x64 },
+- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux, VBOXOSTYPE_Oracle },
+- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64, VBOXOSTYPE_Oracle_x64 },
+- { ovf::CIMOSType_CIMOS_eComStation, VBOXOSTYPE_ECS }
-
- // there are no CIM types for these, so these turn to "other" on export:
-- // SchemaDefs_OSTypeId_OpenBSD
-- // SchemaDefs_OSTypeId_OpenBSD_64
-- // SchemaDefs_OSTypeId_NetBSD
-- // SchemaDefs_OSTypeId_NetBSD_64
+- // VBOXOSTYPE_OpenBSD
+- // VBOXOSTYPE_OpenBSD_x64
+- // VBOXOSTYPE_NetBSD
+- // VBOXOSTYPE_NetBSD_x64
+
+ // Custom OS
+ { ovf::CIMOSType_CIMOS_GNU, SchemaDefs_OSTypeId_GNU },
@@ -1140,37 +1113,36 @@
};
-@@ -150,53 +89,34 @@
+@@ -151,53 +90,32 @@
/* These are the 32-Bit ones. They are sorted by priority. */
static const osTypePattern g_osTypesPattern[] =
{
-- {"Windows NT", SchemaDefs_OSTypeId_WindowsNT4},
-- {"Windows XP", SchemaDefs_OSTypeId_WindowsXP},
-- {"Windows 2000", SchemaDefs_OSTypeId_Windows2000},
-- {"Windows 2003", SchemaDefs_OSTypeId_Windows2003},
-- {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista},
-- {"Windows 2008", SchemaDefs_OSTypeId_Windows2008},
-- {"SUSE", SchemaDefs_OSTypeId_OpenSUSE},
-- {"Novell", SchemaDefs_OSTypeId_OpenSUSE},
-- {"Red Hat", SchemaDefs_OSTypeId_RedHat},
-- {"Mandriva", SchemaDefs_OSTypeId_Mandriva},
-- {"Ubuntu", SchemaDefs_OSTypeId_Ubuntu},
-- {"Debian", SchemaDefs_OSTypeId_Debian},
-- {"QNX", SchemaDefs_OSTypeId_QNX},
-- {"Linux 2.4", SchemaDefs_OSTypeId_Linux24},
-- {"Linux 2.6", SchemaDefs_OSTypeId_Linux26},
-- {"Linux", SchemaDefs_OSTypeId_Linux},
-- {"OpenSolaris", SchemaDefs_OSTypeId_OpenSolaris},
-- {"Solaris", SchemaDefs_OSTypeId_OpenSolaris},
-- {"FreeBSD", SchemaDefs_OSTypeId_FreeBSD},
-- {"NetBSD", SchemaDefs_OSTypeId_NetBSD},
-- {"Windows 95", SchemaDefs_OSTypeId_Windows95},
-- {"Windows 98", SchemaDefs_OSTypeId_Windows98},
-- {"Windows Me", SchemaDefs_OSTypeId_WindowsMe},
-- {"Windows 3.", SchemaDefs_OSTypeId_Windows31},
-- {"DOS", SchemaDefs_OSTypeId_DOS},
-- {"OS2", SchemaDefs_OSTypeId_OS2}
-+
+- {"Windows NT", VBOXOSTYPE_WinNT4},
+- {"Windows XP", VBOXOSTYPE_WinXP},
+- {"Windows 2000", VBOXOSTYPE_Win2k},
+- {"Windows 2003", VBOXOSTYPE_Win2k3},
+- {"Windows Vista", VBOXOSTYPE_WinVista},
+- {"Windows 2008", VBOXOSTYPE_Win2k8},
+- {"SUSE", VBOXOSTYPE_OpenSUSE},
+- {"Novell", VBOXOSTYPE_OpenSUSE},
+- {"Red Hat", VBOXOSTYPE_RedHat},
+- {"Mandriva", VBOXOSTYPE_Mandriva},
+- {"Ubuntu", VBOXOSTYPE_Ubuntu},
+- {"Debian", VBOXOSTYPE_Debian},
+- {"QNX", VBOXOSTYPE_QNX},
+- {"Linux 2.4", VBOXOSTYPE_Linux24},
+- {"Linux 2.6", VBOXOSTYPE_Linux26},
+- {"Linux", VBOXOSTYPE_Linux},
+- {"OpenSolaris", VBOXOSTYPE_OpenSolaris},
+- {"Solaris", VBOXOSTYPE_OpenSolaris},
+- {"FreeBSD", VBOXOSTYPE_FreeBSD},
+- {"NetBSD", VBOXOSTYPE_NetBSD},
+- {"Windows 95", VBOXOSTYPE_Win95},
+- {"Windows 98", VBOXOSTYPE_Win98},
+- {"Windows Me", VBOXOSTYPE_WinMe},
+- {"Windows 3.", VBOXOSTYPE_Win31},
+- {"DOS", VBOXOSTYPE_DOS},
+- {"OS2", VBOXOSTYPE_OS2}
+ {"Parabola GNU/Linux-libre", SchemaDefs_OSTypeId_Parabola},
+ {"gNewSense", SchemaDefs_OSTypeId_gNewSense},
+ {"Blag Linux and GNU", SchemaDefs_OSTypeId_Blag},
@@ -1183,28 +1155,27 @@
+ {"GNU", SchemaDefs_OSTypeId_GNU},
+ {"GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd},
+ {"GNU/Linux", SchemaDefs_OSTypeId_GNULinux},
-+
};
/* These are the 64-Bit ones. They are sorted by priority. */
static const osTypePattern g_osTypesPattern64[] =
{
-- {"Windows XP", SchemaDefs_OSTypeId_WindowsXP_64},
-- {"Windows 2003", SchemaDefs_OSTypeId_Windows2003_64},
-- {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista_64},
-- {"Windows 2008", SchemaDefs_OSTypeId_Windows2008_64},
-- {"SUSE", SchemaDefs_OSTypeId_OpenSUSE_64},
-- {"Novell", SchemaDefs_OSTypeId_OpenSUSE_64},
-- {"Red Hat", SchemaDefs_OSTypeId_RedHat_64},
-- {"Mandriva", SchemaDefs_OSTypeId_Mandriva_64},
-- {"Ubuntu", SchemaDefs_OSTypeId_Ubuntu_64},
-- {"Debian", SchemaDefs_OSTypeId_Debian_64},
-- {"Linux 2.4", SchemaDefs_OSTypeId_Linux24_64},
-- {"Linux 2.6", SchemaDefs_OSTypeId_Linux26_64},
-- {"Linux", SchemaDefs_OSTypeId_Linux26_64},
-- {"OpenSolaris", SchemaDefs_OSTypeId_OpenSolaris_64},
-- {"Solaris", SchemaDefs_OSTypeId_OpenSolaris_64},
-- {"FreeBSD", SchemaDefs_OSTypeId_FreeBSD_64},
+- {"Windows XP", VBOXOSTYPE_WinXP_x64},
+- {"Windows 2003", VBOXOSTYPE_Win2k3_x64},
+- {"Windows Vista", VBOXOSTYPE_WinVista_x64},
+- {"Windows 2008", VBOXOSTYPE_Win2k8_x64},
+- {"SUSE", VBOXOSTYPE_OpenSUSE_x64},
+- {"Novell", VBOXOSTYPE_OpenSUSE_x64},
+- {"Red Hat", VBOXOSTYPE_RedHat_x64},
+- {"Mandriva", VBOXOSTYPE_Mandriva_x64},
+- {"Ubuntu", VBOXOSTYPE_Ubuntu_x64},
+- {"Debian", VBOXOSTYPE_Debian_x64},
+- {"Linux 2.4", VBOXOSTYPE_Linux24_x64},
+- {"Linux 2.6", VBOXOSTYPE_Linux26_x64},
+- {"Linux", VBOXOSTYPE_Linux26_x64},
+- {"OpenSolaris", VBOXOSTYPE_OpenSolaris_x64},
+- {"Solaris", VBOXOSTYPE_OpenSolaris_x64},
+- {"FreeBSD", VBOXOSTYPE_FreeBSD_x64},
+ {"Parabola GNU/Linux-libre", SchemaDefs_OSTypeId_Parabola_64},
+ {"gNewSense", SchemaDefs_OSTypeId_gNewSense_64},
+ {"Blag Linux and GNU", SchemaDefs_OSTypeId_Blag_64},
@@ -1381,3 +1352,14 @@
#endif
rc = VBoxGuestInitDevExt(&g_DevExt,
g_IOPortBase,
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-09-18 22:43:54.956086896 -0300
+@@ -141,7 +141,7 @@
+ #ifdef VBOX_WITH_VIDEOHWACCEL
+ /* Check if 2D video acceleration supported by the guest OS type: */
+ QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
+- m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows";
++ m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Other";
+ #endif /* VBOX_WITH_VIDEOHWACCEL */
+ #ifdef VBOX_WITH_CRHGSMI
+ /* Check if WDDM mode supported by the guest OS type: */
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index e51d0c0a7..41a34fc84 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -1,5 +1,5 @@
---- VirtualBox-4.1.18.orig/Config.kmk 2012-07-24 16:38:43.981310996 -0300
-+++ VirtualBox-4.1.18/Config.kmk 2012-07-24 16:38:44.001309865 -0300
+--- VirtualBox-4.2.0.orig/Config.kmk 2012-09-13 05:26:16.000000000 -0300
++++ VirtualBox-4.2.0/Config.kmk 2012-09-18 21:35:33.118487052 -0300
@@ -56,9 +56,6 @@
PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES
PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES
@@ -10,7 +10,7 @@
# Install paths
## @todo This will change after 4.1 is branched off!
# What is now 'bin' and 'lib' will be moved down under 'staged/', except on
-@@ -125,9 +122,6 @@
+@@ -129,9 +126,6 @@
endif
INST_DOC = doc/
@@ -20,7 +20,7 @@
INST_PACKAGES = packages/
VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
-@@ -136,7 +130,6 @@
+@@ -140,7 +134,6 @@
VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
@@ -28,7 +28,7 @@
VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
-@@ -208,7 +201,6 @@
+@@ -215,7 +208,6 @@
export VBOX_ADDITIONS_SH_MODE = release
export VBOX_DOCUMENTATION_SH_MODE = release
export VBOX_EFI_SH_MODE = release
@@ -36,7 +36,7 @@
endif
# Some info on the vendor
-@@ -361,8 +353,6 @@
+@@ -368,8 +360,6 @@
VBOX_WITH_USB = 1
# Enable the USB 1.1 controller plus virtual USB HID devices.
VBOX_WITH_VUSB = 1
@@ -45,7 +45,7 @@
# Enable the ISCSI feature.
VBOX_WITH_ISCSI = 1
# Enable INIP support in the ISCSI feature.
-@@ -430,9 +420,6 @@
+@@ -439,9 +429,6 @@
ifdef VBOX_WITH_USB
VBOX_WITH_VUSB = 1
endif
@@ -55,10 +55,11 @@
ifdef VBOX_WITH_PCI_PASSTHROUGH
VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
endif
-@@ -591,15 +578,6 @@
+@@ -609,17 +596,6 @@
+ endif
## @}
-
+-
-## @name Extension pack
-## @{
-# Enables the extension pack feature.
@@ -68,10 +69,11 @@
-# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL
-VBOX_WITH_EXTPACK_PUEL_BUILD = 1
-## @}
-
+-
## @name Misc
## @{
-@@ -777,14 +755,6 @@
+ # Enable Seamless mode
+@@ -810,14 +786,6 @@
# Skip stuff.
#
@@ -86,7 +88,7 @@
# VBOX_QUICK can be used by core developers to speed to the build
ifdef VBOX_QUICK
# undefine variables by assigning blank.
-@@ -848,7 +818,6 @@
+@@ -872,7 +840,6 @@
VBOX_WITH_TESTSUITE=
VBOX_WITH_QTGUI=
VBOX_WITH_USB=
@@ -94,7 +96,7 @@
VBOX_WITH_DOCS=
VBOX_WITH_PDM_ASYNC_COMPLETION=
VBOX_WITH_KCHMVIEWER=
-@@ -870,7 +839,6 @@
+@@ -894,7 +861,6 @@
VBOX_WITH_CROGL=
VBOX_WITH_DEBUGGER=
VBOX_WITH_DOCS=
@@ -102,7 +104,7 @@
VBOX_WITH_HARDENING=
VBOX_WITH_HEADLESS=
VBOX_WITH_HGCM=
-@@ -952,9 +920,6 @@
+@@ -985,9 +951,6 @@
#
ifdef VBOX_OSE
VBOX_WITH_VRDP=
@@ -112,7 +114,7 @@
VBOX_WITH_PCI_PASSTHROUGH_IMPL=
VBOX_WITH_OS2_ADDITIONS_BIN=
VBOX_WITH_SECURELABEL=
-@@ -1082,10 +1047,6 @@
+@@ -1118,10 +1081,6 @@
VBOX_WITH_KCHMVIEWER=
endif
@@ -123,17 +125,17 @@
#
# Mark OSE builds clearly, helps figuring out limitations more easily.
#
-@@ -1679,9 +1640,6 @@
- # biossums (set BIOS checksums)
- VBOX_BIOSSUMS ?= $(PATH_OBJ)/biossums/biossums$(HOSTSUFF_EXE)
+@@ -1744,9 +1703,6 @@
+ # bin2c (convert binary files into C arrays)
+ VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
-# RTManifest (extension pack manifest utility)
-VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
-
- # filesplitter (splits java files)
- VBOX_FILESPLIT ?= $(PATH_OBJ)/filesplitter/filesplitter$(HOSTSUFF_EXE)
+ # VBoxCmp (simple /bin/cmp with more sensible output)
+ VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
-@@ -2461,13 +2419,6 @@
+@@ -2638,13 +2594,6 @@
SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
endif
@@ -147,11 +149,10 @@
SDK_VBOX_BLD_OPENSSL = .
SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
SDK_VBOX_BLD_OPENSSL_LIBS ?= \
-@@ -3817,100 +3768,6 @@
- endif
+@@ -4100,99 +4049,6 @@
TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
--
+
-
-#
-# Templates used for building the extension packs.
@@ -248,9 +249,9 @@
#
# Qt 4
# Qt 4
---- VirtualBox-4.1.18.orig/Makefile.kmk 2012-07-24 17:16:47.078929150 -0300
-+++ VirtualBox-4.1.18/Makefile.kmk 2012-07-24 17:16:47.125592981 -0300
-@@ -446,7 +446,6 @@
+--- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300
++++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300
+@@ -378,7 +378,6 @@
include/VBox \
include/VBox/vmm \
include/VBox/com \
@@ -258,12 +259,10 @@
include/VBox/HostServices \
include/VBox/GuestHost \
include/VBox/HGSMI \
-@@ -862,191 +861,6 @@
- additions-build-linux.x86.combined \
- additions-packing
+@@ -990,200 +989,6 @@
--
--#
+
+ #
-# Build the extension packs, all of them.
-#
-# This is tailored (hardcoded) for the extension pack build box.
@@ -325,16 +324,18 @@
-ifeq ($(KBUILD_TARGET),win)
- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-- $(call MSG_L1,Building Windows/amd64 extension packs)
-- $(VBOX_KMK_TIME) ssh vbox@192.168.27.6 " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs)
-endif
-
-extpacks-build-win.x86:
-ifeq ($(KBUILD_TARGET),win)
- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-- $(call MSG_L1,Building Windows/x86 extension packs)
-- $(VBOX_KMK_TIME) ssh vbox@192.168.27.16 " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
-endif
-
-ifeq ($(KBUILD_TARGET),solaris)
@@ -347,17 +348,19 @@
-else
-# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
-extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
-
-extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
-- $(call MSG_L1,Building Solaris/amd64 extension packs)
-- $(VBOX_KMK_TIME) ssh vbox@192.168.27.4 " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
-- $(call MSG_L1,Building Solaris/x86 extension packs)
-- $(VBOX_KMK_TIME) ssh vbox@192.168.27.4 " echo $@/x86 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
+- $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs)
-
-extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
-- $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
-- $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
+- $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
+- $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
-
-.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm
-.PHONY: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
@@ -370,59 +373,65 @@
-#ifeq ($(KBUILD_TARGET),os2)
-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-#else
--# $(VBOX_KMK_TIME) ssh vbox@192.168.27.3 " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
+-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
-#endif
-
-extpacks-build-linux.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-- $(call MSG_L1,Building Linux/amd64 extension packs)
-- $(VBOX_KMK_TIME) ssh vbox@192.168.27.12 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
-endif
-
-extpacks-build-linux.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-- $(call MSG_L1,Building Linux/x86 extension packs)
-- $(VBOX_KMK_TIME) ssh vbox@192.168.27.11 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
-endif
-
-extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-#else
--# $(call MSG_L1,Building FreeBSD/amd64 extension packs)
--# $(VBOX_KMK_TIME) ssh vbox@192.168.27.17 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-# $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs)
+-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+-# $(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs)
-#endif
-
-extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
-# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-#else
--# $(call MSG_L1,Building FreeBSD/x86 extension packs)
--# $(VBOX_KMK_TIME) ssh vbox@192.168.27.7 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-# $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs)
+-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+-# $(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs)
-#endif
-
-extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-- $(call MSG_L1,Building Darwin/amd64 extension packs)
-- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
-- $(VBOX_KMK_TIME) ssh vbox@192.168.27.15 " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
-- $(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
+- $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
+- $(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
+- $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs)
-endif
-
-extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
-ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
- + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
-else
-- $(call MSG_L1,Building Darwin/x86 extension packs)
-- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
-- $(VBOX_KMK_TIME) ssh vbox@192.168.27.5 " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
-- $(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
+- $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 extension packs)
+- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
+- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
+- $(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
+- $(call VBOX_BLD_VM_MSG_END__,Darwin/x86 extension packs)
-endif
-
-
@@ -447,9 +456,10 @@
- extpacks-packing
-
-
- #
+-#
# Build the test suite, all of it.
#
+ # This is currently tailored (hardcoded) for the additions build box just like
--- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp 2012-06-20 10:15:51.000000000 -0300
+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp 2012-07-24 16:18:03.964493454 -0300
@@ -132,11 +132,6 @@
@@ -474,10 +484,10 @@
extern const PDMDEVREG g_DeviceACPI;
extern const PDMDEVREG g_DeviceDMA;
extern const PDMDEVREG g_DeviceFloppyController;
---- VirtualBox-4.1.18.orig/src/VBox/Main/include/ExtPackManagerImpl.h 2012-06-20 10:17:33.000000000 -0300
-+++ /dev/null 2012-07-24 14:48:18.638572110 -0300
-@@ -1,245 +0,0 @@
--/* $Id: ExtPackManagerImpl.h $ */
+--- VirtualBox-4.2.0.orig/src/VBox/Main/include/ExtPackManagerImpl.h 2012-03-13 11:51:50.000000000 -0300
++++ /dev/null 2012-09-18 22:18:48.866734195 -0300
+@@ -1,247 +0,0 @@
+-/* $Id: ExtPackManagerImpl.h 39878 2012-01-25 16:30:07Z vboxsync $ */
-/** @file
- * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC.
- */
@@ -533,6 +543,7 @@
- STDMETHOD(COMGETTER(Description))(BSTR *a_pbstrDescription);
- STDMETHOD(COMGETTER(Version))(BSTR *a_pbstrVersion);
- STDMETHOD(COMGETTER(Revision))(ULONG *a_puRevision);
+- STDMETHOD(COMGETTER(Edition))(BSTR *a_pbstrEdition);
- STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule);
- STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns));
- STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable);
@@ -596,6 +607,7 @@
- STDMETHOD(COMGETTER(Description))(BSTR *a_pbstrDescription);
- STDMETHOD(COMGETTER(Version))(BSTR *a_pbstrVersion);
- STDMETHOD(COMGETTER(Revision))(ULONG *a_puRevision);
+- STDMETHOD(COMGETTER(Edition))(BSTR *a_pbstrEdition);
- STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule);
- STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns));
- STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable);
@@ -722,10 +734,10 @@
-
-#endif
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */
---- VirtualBox-4.1.18.orig/src/VBox/Main/include/ExtPackUtil.h 2012-06-20 10:17:33.000000000 -0300
-+++ /dev/null 2012-07-24 14:48:18.638572110 -0300
+--- VirtualBox-4.2.0.orig/src/VBox/Main/include/ExtPackUtil.h 2012-03-13 11:51:50.000000000 -0300
++++ /dev/null 2012-09-18 22:18:48.866734195 -0300
@@ -1,137 +0,0 @@
--/* $Id: ExtPackUtil.h $ */
+-/* $Id: ExtPackUtil.h 39878 2012-01-25 16:30:07Z vboxsync $ */
-/** @file
- * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++.
- */
@@ -839,14 +851,14 @@
-
-
-void VBoxExtPackInitDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
--RTCString *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
--RTCString *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
--RTCString *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball);
+-RTCString *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
+-RTCString *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
+-RTCString *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball);
-void VBoxExtPackFreeDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
-bool VBoxExtPackIsValidName(const char *pszName);
-bool VBoxExtPackIsValidMangledName(const char *pszMangledName, size_t cchMax = RTSTR_MAX);
--RTCString *VBoxExtPackMangleName(const char *pszName);
--RTCString *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax);
+-RTCString *VBoxExtPackMangleName(const char *pszName);
+-RTCString *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax);
-int VBoxExtPackCalcDir(char *pszExtPackDir, size_t cbExtPackDir, const char *pszParentDir, const char *pszName);
-bool VBoxExtPackIsValidVersionString(const char *pszVersion);
-bool VBoxExtPackIsValidEditionString(const char *pszEdition);
@@ -862,10 +874,10 @@
-
-#endif
-
---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/ExtPackManagerImpl.cpp 2012-06-20 10:17:34.000000000 -0300
-+++ /dev/null 2012-07-24 14:48:18.638572110 -0300
+--- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/ExtPackManagerImpl.cpp 2012-04-03 04:56:24.000000000 -0300
++++ /dev/null 2012-09-18 22:18:48.866734195 -0300
@@ -1,3126 +0,0 @@
--/* $Id: ExtPackManagerImpl.cpp $ */
+-/* $Id: ExtPackManagerImpl.cpp 40468 2012-03-14 17:07:58Z vboxsync $ */
-/** @file
- * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC.
- */
@@ -1260,22 +1272,22 @@
- HRESULT hrc = autoCaller.rc();
- if (SUCCEEDED(hrc))
- {
-- /* HACK ALERT: This is for easing backporting to 4.1. The edition stuff
-- will be changed into a separate */
-- if (m->Desc.strEdition.isEmpty())
-- {
-- Bstr str(m->Desc.strVersion);
-- str.cloneTo(a_pbstrVersion);
-- }
-- else
-- {
-- RTCString strHack(m->Desc.strVersion);
-- strHack.append('-');
-- strHack.append(m->Desc.strEdition);
+- Bstr str(m->Desc.strVersion);
+- str.cloneTo(a_pbstrVersion);
+- }
+- return hrc;
+-}
-
-- Bstr str(strHack);
-- str.cloneTo(a_pbstrVersion);
-- }
+-STDMETHODIMP ExtPackFile::COMGETTER(Edition)(BSTR *a_pbstrEdition)
+-{
+- CheckComArgOutPointerValid(a_pbstrEdition);
+-
+- AutoCaller autoCaller(this);
+- HRESULT hrc = autoCaller.rc();
+- if (SUCCEEDED(hrc))
+- {
+- Bstr str(m->Desc.strEdition);
+- str.cloneTo(a_pbstrEdition);
- }
- return hrc;
-}
@@ -2494,22 +2506,8 @@
- HRESULT hrc = autoCaller.rc();
- if (SUCCEEDED(hrc))
- {
-- /* HACK ALERT: This is for easing backporting to 4.1. The edition stuff
-- will be changed into a separate */
-- if (m->Desc.strEdition.isEmpty())
-- {
-- Bstr str(m->Desc.strVersion);
-- str.cloneTo(a_pbstrVersion);
-- }
-- else
-- {
-- RTCString strHack(m->Desc.strVersion);
-- strHack.append('-');
-- strHack.append(m->Desc.strEdition);
--
-- Bstr str(strHack);
-- str.cloneTo(a_pbstrVersion);
-- }
+- Bstr str(m->Desc.strVersion);
+- str.cloneTo(a_pbstrVersion);
- }
- return hrc;
-}
@@ -2525,6 +2523,20 @@
- return hrc;
-}
-
+-STDMETHODIMP ExtPack::COMGETTER(Edition)(BSTR *a_pbstrEdition)
+-{
+- CheckComArgOutPointerValid(a_pbstrEdition);
+-
+- AutoCaller autoCaller(this);
+- HRESULT hrc = autoCaller.rc();
+- if (SUCCEEDED(hrc))
+- {
+- Bstr str(m->Desc.strEdition);
+- str.cloneTo(a_pbstrEdition);
+- }
+- return hrc;
+-}
+-
-STDMETHODIMP ExtPack::COMGETTER(VRDEModule)(BSTR *a_pbstrVrdeModule)
-{
- CheckComArgOutPointerValid(a_pbstrVrdeModule);
@@ -3991,10 +4003,10 @@
-}
-
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */
---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/ExtPackUtil.cpp 2012-06-20 10:17:34.000000000 -0300
-+++ /dev/null 2012-07-24 14:48:18.638572110 -0300
+--- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/ExtPackUtil.cpp 2012-07-18 05:57:58.000000000 -0300
++++ /dev/null 2012-09-18 22:18:48.866734195 -0300
@@ -1,1385 +0,0 @@
--/* $Id: ExtPackUtil.cpp $ */
+-/* $Id: ExtPackUtil.cpp 41783 2012-06-16 19:24:15Z vboxsync $ */
-/** @file
- * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++.
- */
@@ -4092,7 +4104,7 @@
- *
- * @returns NULL on success, pointer to an error message on failure (caller
- * deletes it).
-- * @param a_pDoc Pointer to the the XML document.
+- * @param a_pDoc Pointer to the XML document.
- * @param a_pExtPackDesc Where to store the extension pack descriptor.
- */
-static RTCString *vboxExtPackLoadDescFromDoc(xml::Document *a_pDoc, PVBOXEXTPACKDESC a_pExtPackDesc)
@@ -5389,25 +5401,22 @@
iprt/alloca.h \
iprt/tcp.h \
iprt/localipc.h \
---- VirtualBox-4.1.18.orig/src/Makefile.kmk 2012-06-20 10:07:57.000000000 -0300
-+++ VirtualBox-4.1.18/src/Makefile.kmk 2012-07-24 22:51:10.206996034 -0300
-@@ -26,14 +26,6 @@
- include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
+--- VirtualBox-4.2.0.orig/src/Makefile.kmk 2012-08-03 09:28:25.000000000 -0300
++++ VirtualBox-4.2.0/src/Makefile.kmk 2012-09-19 03:01:57.588337894 -0300
+@@ -23,10 +23,8 @@
+ if !defined(VBOX_ONLY_ADDITIONS)
include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
+ endif
+-if defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && defined(VBOX_WITH_REM)
+- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
--else if defined(VBOX_ONLY_EXTPACKS)
-- include $(PATH_SUB_CURRENT)/bldprogs/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
-- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
-- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
-- endif
--
- else if defined(VBOX_ONLY_TESTSUITE)
- include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
- include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk
---- VirtualBox-4.1.18.orig/src/VBox/Makefile.kmk 2012-07-24 21:19:55.565641784 -0300
-+++ VirtualBox-4.1.18/src/VBox/Makefile.kmk 2012-07-24 22:12:55.429156962 -0300
+-else if !defined(VBOX_ONLY_BUILD)
++if !defined(VBOX_ONLY_BUILD)
+ # Normal build.
+ if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
+ ifdef VBOX_WITH_REM
+--- VirtualBox-4.2.0.orig/src/VBox/Makefile.kmk 2012-05-30 07:39:32.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Makefile.kmk 2012-09-19 00:03:08.577726965 -0300
@@ -33,19 +33,6 @@
include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
@@ -5428,17 +5437,15 @@
else ifdef VBOX_ONLY_SDK
include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
ifdef VBOX_WITH_VRDP
-@@ -92,9 +79,6 @@
+@@ -92,7 +79,6 @@
if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
endif
-- ifndef VBOX_OSE
-- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
-- endif
+- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
ifdef VBOX_WITH_INSTALLER
include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk # Keep this last.
endif
---- VirtualBox-4.1.18/src/libs/Makefile.kmk.orig 2012-07-24 21:23:26.938013023 -0300
+--- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk 2012-07-24 21:23:26.938013023 -0300
+++ VirtualBox-4.1.18/src/libs/Makefile.kmk 2012-07-24 21:43:42.557911752 -0300
@@ -48,13 +48,6 @@
include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
@@ -5454,52 +5461,46 @@
# libjpeg for VRDP video redirection
if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL)
include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk
---- VirtualBox-4.1.18.orig/src/VBox/Devices/Makefile.kmk 2012-07-24 23:06:45.916276235 -0300
-+++ VirtualBox-4.1.18/src/VBox/Devices/Makefile.kmk 2012-07-24 23:17:00.202963228 -0300
-@@ -21,9 +21,7 @@
+--- VirtualBox-4.2.0.orig/src/VBox/Devices/Makefile.kmk 2012-08-03 09:28:25.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Devices/Makefile.kmk 2012-09-19 02:54:35.912748288 -0300
+@@ -25,9 +25,7 @@
# Include sub-makefiles.
include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
- include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
--else if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT)
-+if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT)
- include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
- endif
- if !defined(VBOX_ONLY_EXTPACKS) # Goes on almost to the end of the file.
-@@ -57,9 +55,6 @@
+-else if defined(VBOX_WITH_PXE_ROM)
++if defined(VBOX_WITH_PXE_ROM)
+ if !defined(VBOX_WITHOUT_ETHERBOOT)
+ include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
+ endif
+@@ -71,9 +69,6 @@
ifdef VBOX_WITH_USB
VBoxDDU_DEFS += VBOX_WITH_USB IN_USBLIB
- VBoxDDU_SDKS.win = WINPSDK W2K3DDK
+ VBoxDDU_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
- if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
- VBoxDDU_DEFS += VBOX_WITH_EHCI_IMPL
- endif
ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
VBoxDDU_DEFS.darwin += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
endif
-@@ -122,9 +117,6 @@
- VBoxDD_DEFS = VBOX_ACPI
- ifdef VBOX_WITH_USB
- VBoxDD_DEFS += VBOX_WITH_USB
+@@ -326,15 +321,7 @@
+ Storage/UsbMsd.cpp
+ endif
+
- if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
- VBoxDD_DEFS += VBOX_WITH_EHCI_IMPL
- endif
- endif
- ifdef VBOX_WITH_VUSB
- VBoxDD_DEFS += VBOX_WITH_VUSB
-@@ -446,11 +438,6 @@
- endif
- ifdef VBOX_WITH_USB
- DevicesR3_DEFS += VBOX_WITH_USB
+ VBoxDD_DEFS += VBOX_WITH_USB
- if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-- DevicesR3_DEFS += VBOX_WITH_EHCI_IMPL
-- DevicesR3_SOURCES += \
+- VBoxDD_DEFS += VBOX_WITH_EHCI_IMPL
+- VBoxDD_SOURCES += \
- USB/DevEHCI.cpp
- endif
- endif
- if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
- DevicesR3_DEFS += VBOX_WITH_PCI_PASSTHROUGH_IMPL
-@@ -607,11 +594,6 @@
+
+ endif # VBOX_WITH_USB
+
+@@ -869,11 +856,6 @@
ifdef VBOX_WITH_USB
VBoxDDGC_DEFS += VBOX_WITH_USB
@@ -5511,7 +5512,7 @@
endif
ifdef VBOX_WITH_VIDEOHWACCEL
-@@ -711,11 +693,6 @@
+@@ -1020,11 +1002,6 @@
endif
ifdef VBOX_WITH_USB
VBoxDDR0_DEFS += VBOX_WITH_USB
@@ -5523,10 +5524,10 @@
endif
if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-@@ -1204,49 +1181,5 @@
-
+@@ -1163,50 +1140,5 @@
endif # !VBOX_ONLY_EXTPACKS
+
-if defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD)
- #
- # The EHCI (USB 2.0) Extension Pack Modules.
@@ -5563,6 +5564,7 @@
- Bus/DevPciRaw.cpp_INCS = Bus
- endif
-
+-
- #
- # The Intel PXE rom.
- #
@@ -5571,11 +5573,11 @@
- VBoxExtPackPuelInsRoms_SOURCES = PC/PXE/PXE-Intel.rom=>PXE-Intel.rom
-endif # VBOX_WITH_EXTPACK_PUEL
-
- include $(KBUILD_PATH)/subfooter.kmk
+ include $(FILE_KBUILD_SUB_FOOTER)
---- VirtualBox-4.1.18.orig/src/VBox/Main/Makefile.kmk 2012-07-24 23:38:25.304126039 -0300
-+++ VirtualBox-4.1.18/src/VBox/Main/Makefile.kmk 2012-07-24 23:38:25.350789964 -0300
-@@ -230,14 +230,12 @@
+--- VirtualBox-4.2.0.orig/src/VBox/Main/Makefile.kmk 2012-09-04 09:48:44.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/Makefile.kmk 2012-09-19 00:46:39.251763337 -0300
+@@ -233,14 +233,12 @@
$(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
$(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
$(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
@@ -5590,7 +5592,7 @@
$(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
endif
VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
-@@ -290,7 +288,6 @@
+@@ -293,7 +291,6 @@
src-all/SharedFolderImpl.cpp \
src-all/VirtualBoxBase.cpp \
src-all/VirtualBoxErrorInfoImpl.cpp \
@@ -5598,25 +5600,25 @@
src-server/ApplianceImpl.cpp \
src-server/ApplianceImplExport.cpp \
src-server/ApplianceImplImport.cpp \
-@@ -543,8 +540,6 @@
- $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
- $(if $(VBOX_WITH_VIDEOHWACCEL),VBOX_WITH_VIDEOHWACCEL,) \
+@@ -538,8 +535,6 @@
+ $(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \
+ $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \
$(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
- $(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
- $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
- $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
+ $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
+ $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
- VBoxC_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
-@@ -602,7 +597,6 @@
+@@ -605,7 +600,6 @@
src-all/SharedFolderImpl.cpp \
src-all/VirtualBoxBase.cpp \
src-all/VirtualBoxErrorInfoImpl.cpp \
- $(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
$(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \
$(if $(VBOX_WITH_USB_CARDREADER),src-client/UsbCardReader.cpp,) \
- src-client/AdditionsFacilityImpl.cpp \
-@@ -711,22 +705,6 @@
- endif # !win
+ src-client/Nvram.cpp \
+@@ -733,22 +727,6 @@
+ $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
-#
@@ -5631,7 +5633,7 @@
- src-helper-apps/VBoxExtPackHelperApp.cpp \
- src-all/ExtPackUtil.cpp
- VBoxExtPackHelperApp_LIBS = \
-- $(LIB_RUNTIME)
+- $(LIB_RUNTIME)
-endif # VBOX_WITH_EXTPACK
-
-
@@ -5648,27 +5650,27 @@
$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-24 23:28:17.985011038 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-24 23:28:18.051673913 -0300
-@@ -167,18 +167,6 @@
- <file alias="status_check_32px.png">images/status_check_32px.png</file>
- <file alias="status_error_16px.png">images/status_error_16px.png</file>
- <file alias="status_error_32px.png">images/status_error_32px.png</file>
-- <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
-- <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
-- <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
-- <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
-- <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
-- <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
-- <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
-- <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
-- <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
-- <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
-- <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
-- <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
- <file alias="proxy_16px.png">images/proxy_16px.png</file>
- <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
- <file alias="proxy_32px.png">images/proxy_32px.png</file>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-05-30 07:39:18.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 00:51:25.413310527 -0300
+@@ -169,18 +169,6 @@
+ <file alias="status_check_32px.png">images/status_check_32px.png</file>
+ <file alias="status_error_16px.png">images/status_error_16px.png</file>
+ <file alias="status_error_32px.png">images/status_error_32px.png</file>
+- <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
+- <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
+- <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
+- <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
+- <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
+- <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
+- <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
+- <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
+- <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
+- <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
+- <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
+- <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
+ <file alias="proxy_16px.png">images/proxy_16px.png</file>
+ <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
+ <file alias="proxy_32px.png">images/proxy_32px.png</file>
--- VirtualBox-4.1.18.orig/src/VBox/Installer/linux/Makefile.kmk 2012-07-25 00:32:00.780012664 -0300
+++ VirtualBox-4.1.18/src/VBox/Installer/linux/Makefile.kmk 2012-07-25 00:32:00.806677728 -0300
@@ -170,11 +170,6 @@
@@ -5702,17 +5704,17 @@
-E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \
-E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
-E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
---- VirtualBox-4.1.18.orig/src/VBox/Installer/darwin/Makefile.kmk 2012-07-25 00:36:55.929571374 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/darwin/Makefile.kmk 2012-07-25 00:36:55.959569630 -0300
-@@ -629,7 +629,6 @@
+--- VirtualBox-4.2.0.orig/src/VBox/Installer/darwin/Makefile.kmk 2012-09-08 06:36:03.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Installer/darwin/Makefile.kmk 2012-09-19 00:55:08.991167973 -0300
+@@ -497,7 +497,6 @@
MacOS/VirtualBoxVM \
MacOS/VBoxNetAdpCtl \
MacOS/VBoxNetDHCP \
- MacOS/VBoxExtPackHelperApp \
- MacOS/VBoxBalloonCtrl
+ MacOS/VBoxBalloonCtrl \
+ MacOS/VBoxAutostart
ifdef VBOX_WITH_WEBSERVICES
- VBOX_DI_VBAPP_PROGS += \
-@@ -659,7 +658,6 @@
+@@ -522,7 +521,6 @@
Resources/virtualbox.icns \
Resources/virtualbox.png \
Resources/virtualbox-vbox.icns \
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index 9599a3a49..4703da68d 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -21,8 +21,8 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
- "recompiles the vboxdrv kernel module if necessary."
+ "libre module by executing<br/><br/>"
+ " <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>"
-+ "as root. If you don't use our stock kernel libre, install virtualbox-libre-source and "
-+ "execute dkms install vboxhost/4.1.18 ."
++ "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and "
++ "execute dkms autoinstall ."
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -42,7 +42,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V
- "OSE version and the PUEL version of VirtualBox."
+ "The VirtualBox kernel libre modules do not match this version of "
+ "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> "
-+ " <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>"
++ " <font color=blue>'dkms autoinstall'</font><br/><br/>"
);
QString g_QStrHintOtherNoDriver = QApplication::tr(
@@ -85,7 +85,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-
+ if you don't use our stock kernel libre compile the modules with
- sudo /etc/init.d/vboxdrv setup
-+ sudo dkms install vboxhost/4.1.18
++ sudo dkms autoinstall
You will not be able to start VMs until this problem is fixed.
EOF
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-additions.install b/libre/virtualbox-libre/virtualbox-libre-guest-additions.install
new file mode 100755
index 000000000..38bbe807d
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-additions.install
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ getent group vboxsf > /dev/null || groupadd -g 109 vboxsf
+ true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+ # rename /etc/rc.d/vboxservice
+ if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then
+ cat << EOF
+==> rc.d vbox-service script was renamed to vboxservice.
+EOF
+ fi
+ # fix gid of vboxsf
+ if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then
+ groupmod -g 109 vboxsf
+ fi
+ true
+}
+
+# arg 1: the old package version
+post_remove() {
+ groupdel vboxsf >/dev/null 2>&1 || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-source.install
new file mode 100755
index 000000000..966fb5681
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-source.install
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ cat << EOF
+==> To build and install your modules run dkms install vboxguest/${1%-*}
+==> To do this automatically at startup you can add dkms in your DAEMONS
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-source.install
new file mode 100755
index 000000000..6a3994c8d
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-host-source.install
@@ -0,0 +1,29 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ cat << EOF
+==> To build and install your modules run dkms install vboxhost/${1%-*}
+==> To do this automatically at startup you can add dkms in your DAEMONS
+EOF
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_upgrade() {
+ pre_remove "$2"
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ post_install "$1"
+}
+
+# arg 1: the old package version
+pre_remove() {
+ # Remove modules using dkms
+ [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-22 22:25:55 +0000