diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-25 13:34:49 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-25 13:34:49 +0100 |
commit | 416f65d4b97ff26629ddfa1b40ea2041c3e75358 (patch) | |
tree | 61e28b785eb3aa9e55ea269e170277b3d3b6e1fa /community/virtualbox-modules | |
parent | b14277452871db749ef4faa7db7e69bfce39f1a7 (diff) | |
parent | 6fbdd2899f39266e458531dcffefb85b9ce8d1b9 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libnewt/PKGBUILD
community/luasec/PKGBUILD
extra/expect/PKGBUILD
extra/fribidi/PKGBUILD
extra/goffice/PKGBUILD
extra/pidgin/PKGBUILD
extra/postgresql/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
Diffstat (limited to 'community/virtualbox-modules')
4 files changed, 20 insertions, 20 deletions
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 338b4763d..a3f87ede8 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 79182 2012-10-31 07:25:55Z tpowa $ +# $Id: PKGBUILD 81593 2012-12-24 16:28:35Z seblu $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.4 -pkgrel=2 +pkgver=4.2.6 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') makedepends=('linux-headers' - "virtualbox-host-source>=$pkgver" - "virtualbox-guest-source>=$pkgver" + "virtualbox-host-dkms>=$pkgver" + "virtualbox-guest-dkms>=$pkgver" 'expac') build() { # current kernel version + _kernver=3.7.0-1-ARCH _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.6.0-1-ARCH # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -31,13 +31,13 @@ build() { package_virtualbox-host-modules(){ pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.6' 'linux<3.7') + depends=('linux>=3.7' 'linux<3.8') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install + _kernver=3.7.0-1-ARCH _kernver=$(expac -Q '%v' linux-headers)-ARCH - # _kernver=3.6.0-1-ARCH _extraver=extramodules-${_kernver%.*}-ARCH install -dm755 "$pkgdir/usr/lib/modules/$_extraver" @@ -50,13 +50,13 @@ package_virtualbox-host-modules(){ package_virtualbox-guest-modules(){ pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.6' 'linux<3.7') + depends=('linux>=3.7' 'linux<3.8') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install + _kernver=3.7.0-1-ARCH _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.6.0-1-ARCH _extraver=extramodules-${_kernver%.*}-ARCH install -dm755 "$pkgdir/usr/lib/modules/$_extraver" diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh index 371c9b982..476449541 100755 --- a/community/virtualbox-modules/build.sh +++ b/community/virtualbox-modules/build.sh @@ -6,12 +6,12 @@ if (( $# != 1 )); then exit 1 fi -linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 -makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 makechrootpkg -r /var/lib/archbuild/$1-x86_64 diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index e5d1038af..110042ad7 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 3f2ed4a10..b32e5c46e 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -3,17 +3,17 @@ cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' + EXTRAMODULES='extramodules-3.7-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |