summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-12-27 03:22:42 -0800
committerroot <root@rshg054.dnsready.net>2012-12-27 03:22:42 -0800
commitbea8c358e2a890b16f8f158995cd342952fd4a60 (patch)
treec4501bab0dd73d4c2cd39f0988290b2c469a68c3
parent4b9819d98573d82cec1b07beb719390f5fa4aed1 (diff)
Thu Dec 27 03:22:42 PST 2012
-rw-r--r--libre/virtualbox-libre/PKGBUILD6
-rw-r--r--libre/virtualbox-libre/free-distros.patch23
-rw-r--r--libre/virtualbox-libre/virtualbox-libre-guest-dkms.install30
-rw-r--r--libre/virtualbox-libre/virtualbox-libre-host-dkms.install30
-rw-r--r--libre/virtualbox-libre/virtualbox-libre.install2
5 files changed, 76 insertions, 15 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 710177923..a311a0f53 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -110,7 +110,7 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
'85141ccd2621a8e004b8f55c9a1f83eb'
- '54884839546647efd75adb22dbd68337')
+ '6c93159ec2a8f2b132d87cde7202749e')
build() {
cd "VirtualBox-$pkgver"
@@ -294,7 +294,7 @@ package_virtualbox-libre-host-dkms() {
conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
optdepends=('linux-libre-headers'
'linux-libre-lts-headers')
- install=virtualbox-libre-host-source.install
+ install=virtualbox-libre-host-dkms.install
install -dm755 "$pkgdir/usr/src"
source "VirtualBox-$pkgver/env.sh"
@@ -310,7 +310,7 @@ package_virtualbox-libre-guest-dkms() {
conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source')
optdepends=('linux-libre-headers'
'linux-libre-lts-headers')
- install=virtualbox-libre-guest-source.install
+ install=virtualbox-libre-guest-dkms.install
install -dm755 "$pkgdir/usr/src"
source "VirtualBox-$pkgver/env.sh"
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index db6774542..8004ee99a 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -502,10 +502,10 @@ index 6ae0372..df65e60 100644
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index 4c52fb0..fbccfaf 100644
+index c5a4cfe..b3e0247 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,45 +44,33 @@ struct osTypePattern
+@@ -44,46 +44,33 @@ struct osTypePattern
static const osTypePattern gs_OSTypePattern[] =
{
@@ -523,6 +523,7 @@ index 4c52fb0..fbccfaf 100644
- { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
- { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
- { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
+- { QRegExp("(Wi.*2012)|(W2K12)", Qt::CaseInsensitive), "Windows2012_64" },
- { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
- { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
- { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
@@ -578,7 +579,7 @@ index 4c52fb0..fbccfaf 100644
{ 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" },
-@@ -90,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
{ 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" },
@@ -587,7 +588,7 @@ index 4c52fb0..fbccfaf 100644
{ QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
{ QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
{ QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -115,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -116,15 +103,50 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
{ QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
{ QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -646,27 +647,27 @@ index 4c52fb0..fbccfaf 100644
{ QRegExp("L4", Qt::CaseInsensitive), "L4" },
{ QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
{ QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -136,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -137,6 +159,8 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
{ QRegExp("Net", Qt::CaseInsensitive), "Netware" },
{ QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
-+
++
+ /* Other: */
{ QRegExp("Ot", Qt::CaseInsensitive), "Other" },
};
-@@ -230,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
+@@ -231,11 +255,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
/* Create widgets: */
QVBoxLayout *pMainLayout = new QVBoxLayout(this);
{
+ pMainLayout->setContentsMargins(8, 6, 8, 6);
m_pLabel = new QIRichTextLabel(this);
-+ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
++ m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
- pMainLayout->addWidget(m_pLabel);
- pMainLayout->addWidget(m_pNameAndSystemEditor);
- pMainLayout->addStretch();
-+ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
++ m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+ pMainLayout->addWidget(m_pLabel, 1);
+ pMainLayout->addWidget(m_pNameAndSystemEditor, 1);
}
@@ -1393,10 +1394,10 @@ index 275e1e6..34171eb 100644
<context>
<name>UINetworkManagerDialog</name>
diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-index fcaed77..ab92ef9 100644
+index f902373..625da36 100644
--- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-@@ -4830,6 +4830,10 @@
+@@ -4850,6 +4850,10 @@
<source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
<translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
</message>
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
new file mode 100644
index 000000000..2d62eae43
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add vboxguest/${1%-*}
+ 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-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
new file mode 100644
index 000000000..8028cb7e0
--- /dev/null
+++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
@@ -0,0 +1,30 @@
+#/bin/sh
+
+# arg 1: the new package version
+post_install() {
+ dkms add vboxhost/${1%-*}
+ 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:
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 3d93b47a3..90d8a8739 100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -30,7 +30,7 @@ post_upgrade() {
post_install "$1"
if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
cat << EOF
-===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-modules.
+===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules.
===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package.
EOF
fi