summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-03-16 03:21:29 +0000
committerroot <root@rshg054.dnsready.net>2012-03-16 03:21:29 +0000
commit636ce8849a9c82c1787c2919ffcfe6685cb799d3 (patch)
tree8e68a1db517ae127f6460dbb7095cb70f9081cbf
parentcd326e60e1e54ebe83bd700850b313c69f419eef (diff)
Fri Mar 16 03:21:29 UTC 2012
-rw-r--r--kernels/linux-libre-xen/PKGBUILD6
-rw-r--r--kernels/linux-libre-xen/linux-libre-xen.install2
-rw-r--r--libre/virtualbox-modules/LocalConfig.kmk2
-rw-r--r--libre/virtualbox-modules/PKGBUILD18
4 files changed, 14 insertions, 14 deletions
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 72d62953e..24e08b644 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -11,8 +11,8 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kerne
# pkgname=linux-custom # Build kernel with a different name
_kernelname=-LIBRE-XEN
_basekernel=3.2
-pkgver=${_basekernel}.9
-pkgrel=2
+pkgver=${_basekernel}.11
+pkgrel=1
arch=('i686' 'x86_64')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -30,7 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
'i915-gpu-finish.patch'
'ext4-options.patch')
md5sums=('27c641c4f6785fc647cdd3e44963a55c'
- '8e601878ccdd37111cc84500ebd81387'
+ '09abd6a4e9ae7373a3151b61781ab2fe'
'aafbddba8ddeca5f13bac26cd5167a6c'
'81dce3388fcb0b1e8aa1070ccbfb5d62'
'b7c2805bb287a644c0a303bf7721e534'
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 609bf0a79..17653f195 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-xen
-KERNEL_VERSION=3.2.9-2-LIBRE-XEN
+KERNEL_VERSION=3.2.11-1-LIBRE-XEN
post_install () {
# updating module dependencies
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"