diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
commit | ea319c11ce5dcbe5994f166ea099b115bbffe960 (patch) | |
tree | 365b7a8276a93d738840c4481a1ff5e327920738 /libre/virtualbox-libre-modules/PKGBUILD | |
parent | 37936150d275890b518542e93a435ab5815d722b (diff) | |
parent | 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/conntrack-tools/01-config-file-path.patch
community-testing/conntrack-tools/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gigi/PKGBUILD
community-testing/glob2/PKGBUILD
community-testing/megaglest/PKGBUILD
community-testing/openimageio/PKGBUILD
community/gtk2hs-buildtools/PKGBUILD
community/haddock/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libnetfilter_conntrack/PKGBUILD
community/libnetfilter_queue/PKGBUILD
community/libnfnetlink/PKGBUILD
community/sfk/PKGBUILD
extra/cabal-install/PKGBUILD
extra/claws-mail/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/nx/PKGBUILD
extra/ocaml/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/libtool-multilib/PKGBUILD
social/squirm/PKGBUILD
staging/kdebindings-python/PKGBUILD
testing/curl/PKGBUILD
testing/dnsutils/PKGBUILD
testing/dnsutils/remove-bind.patch
testing/mesa/PKGBUILD
testing/openldap/PKGBUILD
testing/pam/PKGBUILD
testing/subversion/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
Diffstat (limited to 'libre/virtualbox-libre-modules/PKGBUILD')
-rw-r--r-- | libre/virtualbox-libre-modules/PKGBUILD | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 270e14af9..3bd4616eb 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.0 -pkgrel=5.3 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -32,15 +32,14 @@ build() { package_virtualbox-libre-host-modules(){ pkgdesc='Host kernel libre modules for VirtualBox' - depends=('linux-libre>=3.5' 'linux-libre<3.6') + depends=('linux-libre>=3.6' 'linux-libre<3.7') provides=("virtualbox-host-modules=${pkgver}") replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') install=virtualbox-libre-host-modules.install _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - #_extraver=extramodules-${_kernver%.*}-LIBRE - _extraver=extramodules-3.5-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" @@ -52,15 +51,14 @@ package_virtualbox-libre-host-modules(){ package_virtualbox-libre-guest-modules(){ pkgdesc='Guest kernel libre modules for VirtualBox' license=('GPL') - depends=('linux-libre>=3.5' 'linux-libre<3.6') + depends=('linux-libre>=3.6' 'linux-libre<3.7') provides=("virtualbox-guest-modules=${pkgver}") replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') install=virtualbox-libre-guest-modules.install _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE - #_extraver=extramodules-${_kernver%.*}-LIBRE - _extraver=extramodules-3.5-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" |