summaryrefslogtreecommitdiff
path: root/community/virtualbox/vboxbuild
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2011-12-22 09:09:45 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2011-12-22 09:09:45 +0100
commit3680463fea4793ab39000b102bacf1bb66eceafc (patch)
tree7ed09ff631c5955e24bcf6fb1c6eb1a3cc4456fd /community/virtualbox/vboxbuild
parentcf1b8826accdb5f1a092ed387f66f061920c4953 (diff)
parent69d24275e4d5296a5f02e4c4d0fc438a80d159b8 (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/vboxbuild')
-rwxr-xr-xcommunity/virtualbox/vboxbuild6
1 files changed, 3 insertions, 3 deletions
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