summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-09-19 04:45:19 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-09-19 04:45:19 -0300
commit8791aa7f874f2bfe7992cbfff2b200b9e06aa2a8 (patch)
tree70f4761e751b96ce2c8d4d7ff1dad4f613c6d7a6
parentca760033c159aa61c25633927cce6cac579d5e5a (diff)
virtualbox-libre-4.2.0-2: fixing issues on free-distros.patch
-rwxr-xr-xlibre/virtualbox-libre/PKGBUILD2
-rwxr-xr-xlibre/virtualbox-libre/free-distros.patch86
2 files changed, 44 insertions, 44 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index cff380c81..eae729e28 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -62,7 +62,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'67cc4c8611890038eb3e4114ae899525'
- '058c61d52984c1c3b23006f151ed1562')
+ '980675863553880453da168b9450d724')
_extramodules=extramodules-3.5-LIBRE
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index ac0a840e3..11b4fd6f3 100755
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -990,7 +990,7 @@
VBOXOSFAMILY_32BIT_HACK = 0x7fffffff
} VBOXOSFAMILY;
--- 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
++++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-09-19 04:40:38.226412294 -0300
@@ -50,94 +50,33 @@
g_osTypes[] =
{
@@ -1085,31 +1085,31 @@
- // VBOXOSTYPE_NetBSD_x64
+
+ // Custom OS
-+ { ovf::CIMOSType_CIMOS_GNU, SchemaDefs_OSTypeId_GNU },
-+ { ovf::CIMOSType_CIMOS_GNU_64, SchemaDefs_OSTypeId_GNU_64 },
-+ { ovf::CIMOSType_CIMOS_GNUHurd, SchemaDefs_OSTypeId_GNUHurd },
-+ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_GNULinux },
-+ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_GNULinux_64 },
++ { ovf::CIMOSType_CIMOS_GNU, VBOXOSTYPE_GNU },
++ { ovf::CIMOSType_CIMOS_GNU_64, VBOXOSTYPE_GNU_64 },
++ { ovf::CIMOSType_CIMOS_GNUHurd, VBOXOSTYPE_GNUHurd },
++ { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_GNULinux },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_GNULinux_64 },
+
+ // GNU/Linux free distros
-+ { ovf::CIMOSType_CIMOS_gNewSense, SchemaDefs_OSTypeId_gNewSense },
-+ { ovf::CIMOSType_CIMOS_gNewSense_64, SchemaDefs_OSTypeId_gNewSense_64 },
-+ { ovf::CIMOSType_CIMOS_Dragora, SchemaDefs_OSTypeId_Dragora },
-+ { ovf::CIMOSType_CIMOS_Dragora_64, SchemaDefs_OSTypeId_Dragora_64 },
-+ { ovf::CIMOSType_CIMOS_Musix, SchemaDefs_OSTypeId_Musix },
-+ { ovf::CIMOSType_CIMOS_Musix_64, SchemaDefs_OSTypeId_Musix_64 },
-+ { ovf::CIMOSType_CIMOS_Trisquel, SchemaDefs_OSTypeId_Trisquel },
-+ { ovf::CIMOSType_CIMOS_Trisquel_64, SchemaDefs_OSTypeId_Trisquel_64 },
-+ { ovf::CIMOSType_CIMOS_Dynebolic, SchemaDefs_OSTypeId_Dynebolic },
-+ { ovf::CIMOSType_CIMOS_Venenux, SchemaDefs_OSTypeId_Venenux },
++ { ovf::CIMOSType_CIMOS_gNewSense, VBOXOSTYPE_gNewSense },
++ { ovf::CIMOSType_CIMOS_gNewSense_64, VBOXOSTYPE_gNewSense_64 },
++ { ovf::CIMOSType_CIMOS_Dragora, VBOXOSTYPE_Dragora },
++ { ovf::CIMOSType_CIMOS_Dragora_64, VBOXOSTYPE_Dragora_64 },
++ { ovf::CIMOSType_CIMOS_Musix, VBOXOSTYPE_Musix },
++ { ovf::CIMOSType_CIMOS_Musix_64, VBOXOSTYPE_Musix_64 },
++ { ovf::CIMOSType_CIMOS_Trisquel, VBOXOSTYPE_Trisquel },
++ { ovf::CIMOSType_CIMOS_Trisquel_64, VBOXOSTYPE_Trisquel_64 },
++ { ovf::CIMOSType_CIMOS_Dynebolic, VBOXOSTYPE_Dynebolic },
++ { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux },
+
+ // GNU/Linux free distros that we have support for but CIM doesn't
-+ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Parabola },
-+ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Parabola_64 },
-+ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Blag },
-+ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Blag_64 },
-+ { ovf::CIMOSType_CIMOS_GNULinux, SchemaDefs_OSTypeId_Ututo },
-+ { ovf::CIMOSType_CIMOS_GNULinux_64, SchemaDefs_OSTypeId_Ututo_64 },
++ { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Parabola },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Parabola_64 },
++ { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Blag },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Blag_64 },
++ { ovf::CIMOSType_CIMOS_GNULinux, VBOXOSTYPE_Ututo },
++ { ovf::CIMOSType_CIMOS_GNULinux_64, VBOXOSTYPE_Ututo_64 },
};
@@ -1143,18 +1143,18 @@
- {"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},
-+ {"Dragora", SchemaDefs_OSTypeId_Dragora},
-+ {"Ututo XS", SchemaDefs_OSTypeId_Ututo},
-+ {"Musix", SchemaDefs_OSTypeId_Musix},
-+ {"Trisquel", SchemaDefs_OSTypeId_Trisquel},
-+ {"Dyne:bolic", SchemaDefs_OSTypeId_Dynebolic},
-+ {"Venenux", SchemaDefs_OSTypeId_Venenux},
-+ {"GNU", SchemaDefs_OSTypeId_GNU},
-+ {"GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd},
-+ {"GNU/Linux", SchemaDefs_OSTypeId_GNULinux},
++ {"Parabola GNU/Linux-libre", VBOXOSTYPE_Parabola},
++ {"gNewSense", VBOXOSTYPE_gNewSense},
++ {"Blag Linux and GNU", VBOXOSTYPE_Blag},
++ {"Dragora", VBOXOSTYPE_Dragora},
++ {"Ututo XS", VBOXOSTYPE_Ututo},
++ {"Musix", VBOXOSTYPE_Musix},
++ {"Trisquel", VBOXOSTYPE_Trisquel},
++ {"Dyne:bolic", VBOXOSTYPE_Dynebolic},
++ {"Venenux", VBOXOSTYPE_Venenux},
++ {"GNU", VBOXOSTYPE_GNU},
++ {"GNU-Hurd", VBOXOSTYPE_GNUHurd},
++ {"GNU/Linux", VBOXOSTYPE_GNULinux},
};
/* These are the 64-Bit ones. They are sorted by priority. */
@@ -1176,15 +1176,15 @@
- {"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},
-+ {"Dragora", SchemaDefs_OSTypeId_Dragora_64},
-+ {"Ututo XS", SchemaDefs_OSTypeId_Ututo_64},
-+ {"Musix", SchemaDefs_OSTypeId_Musix_64},
-+ {"Trisquel", SchemaDefs_OSTypeId_Trisquel_64},
-+ {"GNU", SchemaDefs_OSTypeId_GNU_64},
-+ {"GNU/Linux", SchemaDefs_OSTypeId_GNULinux_64},
++ {"Parabola GNU/Linux-libre", VBOXOSTYPE_Parabola_64},
++ {"gNewSense", VBOXOSTYPE_gNewSense_64},
++ {"Blag Linux and GNU", VBOXOSTYPE_Blag_64},
++ {"Dragora", VBOXOSTYPE_Dragora_64},
++ {"Ututo XS", VBOXOSTYPE_Ututo_64},
++ {"Musix", VBOXOSTYPE_Musix_64},
++ {"Trisquel", VBOXOSTYPE_Trisquel_64},
++ {"GNU", VBOXOSTYPE_GNU_64},
++ {"GNU/Linux", VBOXOSTYPE_GNULinux_64},
};
/**