diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
| commit | 3680463fea4793ab39000b102bacf1bb66eceafc (patch) | |
| tree | 7ed09ff631c5955e24bcf6fb1c6eb1a3cc4456fd /community/virtualbox | |
| parent | cf1b8826accdb5f1a092ed387f66f061920c4953 (diff) | |
| parent | 69d24275e4d5296a5f02e4c4d0fc438a80d159b8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/qtcreator/PKGBUILD
core/glibc/PKGBUILD
core/openldap/PKGBUILD
extra/libgsf/PKGBUILD
extra/phonon/PKGBUILD
extra/poppler/PKGBUILD
extra/smartmontools/PKGBUILD
extra/vlc/PKGBUILD
extra/xfwm4/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libogg/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxcursor/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxfixes/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/lib32-udev/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
Diffstat (limited to 'community/virtualbox')
| -rw-r--r-- | community/virtualbox/PKGBUILD | 12 | ||||
| -rwxr-xr-x | community/virtualbox/vboxbuild | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index bc16759fa..be15a5682 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60048 2011-12-03 18:39:55Z ibiru $ +# $Id: PKGBUILD 60899 2011-12-19 18:08:37Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.6 -pkgrel=4 +pkgver=4.1.8 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -178,12 +178,12 @@ package_virtualbox-archlinux-additions(){ # install sample config install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" } -md5sums=('89b979d1b817242c7cdcb489898f166a' - 'af534f713993eb077df26ff9a44fb080' +md5sums=('2092bba46baa62fab5520d67dee2ece8' + '2f6b36ff143eb8da55ee92676708e757' '5f85710e0b8606de967716ded7b2d351' '6ab2455c391d8cc005e2f4461ae26a3b' '78ffa67ff131680f1d2b6f06d4325c5b' - 'cd8a53d0bfb26632d5b4d4e91a2b91d2' + '67688bff176d3c6fac5664dc282fea52' '97e193f050574dd272a38e5ee5ebe62b' '3c08ad30b89add47d3f45121200a5360' 'e7416331d0bc331f3b5aae3e5d104642') diff --git a/community/virtualbox/vboxbuild b/community/virtualbox/vboxbuild index c74004199..e6fb94edd 100755 --- a/community/virtualbox/vboxbuild +++ b/community/virtualbox/vboxbuild @@ -32,11 +32,11 @@ fi for kdir in /lib/modules/[2-3]*; do if [[ ! -d $kdir/kernel ]]; then # found a stale kernel - mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*) + mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*) if (( ${#mods[@]} )); then stat_busy "Removing all old VirtualBox kernel modules" if rm -f "${mods[@]}" && - rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then + rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then stat_done else stat_fail @@ -74,7 +74,7 @@ for kernver; do stat_fail fi done - gzip -9 "$MODULE_DIR"/*.ko + gzip -f9 "$MODULE_DIR"/*.ko depmod "$kernver" stat_done done |