diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-13 19:51:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-13 19:51:35 -0300 |
| commit | a552e7fe41f2145b6e785ce03c6b2d8920ab7b43 (patch) | |
| tree | c938070c363db70f111d058c4fccc781ff0dea0b /community/virtualbox | |
| parent | 0a15db3fa6f40e080010ab6c553b1ce9e32db4a9 (diff) | |
| parent | 7c64c5039335c73eaa1a402c417235e8ca9a5109 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/emesene/PKGBUILD
community/minidlna/PKGBUILD
community/uzbl/PKGBUILD
community/virtualbox/PKGBUILD
extra/lirc/PKGBUILD
libre/pacman/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
testing/subversion/PKGBUILD
Diffstat (limited to 'community/virtualbox')
| -rw-r--r-- | community/virtualbox/PKGBUILD | 9 | ||||
| -rw-r--r-- | community/virtualbox/virtualbox-guest-modules.install | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index ee557ebee..f8331eaea 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $ +# $Id: PKGBUILD 49114 2011-06-11 08:28:49Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') pkgver=4.0.8 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -16,7 +16,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh 18-system-xorg.patch -_kernver=2.6.38-LIBRE + change_default_driver_dir.patch) +_kernver=2.6.39-LIBRE build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -178,7 +179,7 @@ package_virtualbox-guest-modules(){ pkgdesc="VirtualBox kernel modules for Linux guests" license=('GPL') install=virtualbox-guest-modules.install - depends=('kernel26>=2.6.38' 'kernel26<2.6.39') + depends=('kernel26>=2.6.39' 'kernel26<2.6.40') replaces=('virtualbox-ose-additions-modules') conflicts=('virtualbox-ose-additions-modules') diff --git a/community/virtualbox/virtualbox-guest-modules.install b/community/virtualbox/virtualbox-guest-modules.install index 3681c28e3..ae05bd1ba 100644 --- a/community/virtualbox/virtualbox-guest-modules.install +++ b/community/virtualbox/virtualbox-guest-modules.install @@ -1,4 +1,4 @@ -KERNEL_VERSION='2.6.38-ARCH' +KERNEL_VERSION='2.6.39-ARCH' post_install() { cat << EOM |