diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-16 03:21:29 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-16 03:21:29 +0000 |
| commit | 636ce8849a9c82c1787c2919ffcfe6685cb799d3 (patch) | |
| tree | 8e68a1db517ae127f6460dbb7095cb70f9081cbf /libre | |
| parent | cd326e60e1e54ebe83bd700850b313c69f419eef (diff) | |
Fri Mar 16 03:21:29 UTC 2012
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/virtualbox-modules/LocalConfig.kmk | 2 | ||||
| -rw-r--r-- | libre/virtualbox-modules/PKGBUILD | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libre/virtualbox-modules/LocalConfig.kmk b/libre/virtualbox-modules/LocalConfig.kmk index af79f90cd..cd4e65e03 100644 --- a/libre/virtualbox-modules/LocalConfig.kmk +++ b/libre/virtualbox-modules/LocalConfig.kmk @@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST = VBOX_WITH_UPDATE_REQUEST = VBOX_WITH_VNC := 1 VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk +VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk VBOX_GCC_WERR = VBOX_GCC_WARN = diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index a99a9ecaf..388eb8264 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -3,21 +3,21 @@ #Contributor (Parabola): Jorge López <jorginho@adinet.com.uy> pkgbase=virtualbox-modules -pkgname=('virtualbox-modules' 'virtualbox-libre-modules') +pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') pkgver=4.1.10 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') provides=("virtualbox-modules=$pkgver") -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-libre-headers') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) md5sums=('263e495ef3a7ab75943af28d446ee702' - '4c88bd122677a35f68abd76eb01b378b' + '7e921d2ae193ec04b255daa0e338d3a4' 'ed1341881437455d9735875ddf455fbe') _extramodules=extramodules-3.2-LIBRE @@ -51,11 +51,11 @@ build() { make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" } -package_virtualbox-libre-modules(){ +package_virtualbox-parabola-modules(){ pkgdesc="Additions only for Parabola guests (kernel modules)" license=('GPL') - install=virtualbox-libre-modules.install - depends=('linux>=3.2' 'linux<3.3') + install=virtualbox-parabola-modules.install + depends=('linux-libre>=3.2' 'linux-libre<3.3') replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') provides=("virtualbox-archlinux-modules=$pkgver") @@ -74,14 +74,14 @@ package_virtualbox-libre-modules(){ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-libre-modules.install" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install" } package_virtualbox-modules(){ pkgdesc="Kernel modules for VirtualBox" license=('GPL') install=virtualbox-modules.install - depends=('linux>=3.2' 'linux<3.3') + depends=('linux-libre>=3.2' 'linux-libre<3.3') source "$srcdir/VirtualBox-${pkgver}/env.sh" |