diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-07 13:09:53 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-07 13:09:53 -0400 |
commit | 44fb7936931db66f6ba7c46f73ebb29d2725fe58 (patch) | |
tree | 0be1bc01e36b6aea80bbae6a00f7cee123a162c3 /libre/virtualbox-libre/vboxbuild | |
parent | de83d1a9287e1d73029b1202069e3cefae26bb31 (diff) | |
parent | 108181f9a57602fd8d527dafb3b46fc0b59711df (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/virtualbox-libre/vboxbuild')
-rw-r--r-- | libre/virtualbox-libre/vboxbuild | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild index 4bc8e0c9d..350d0c6ad 100644 --- a/libre/virtualbox-libre/vboxbuild +++ b/libre/virtualbox-libre/vboxbuild @@ -1,13 +1,23 @@ #!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions . /etc/vbox/vbox.cfg MODLIST=() LOG="/var/log/vbox-install.log" >| "$LOG" +stat_busy() { + printf '==> %s ... ' "$1" +} + +stat_done() { + echo 'done' +} + +stat_fail() { + echo 'failed' +} + if [[ $INSTALL_DIR ]]; then VBOXMANAGE=$INSTALL_DIR/VBoxManage BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp @@ -29,7 +39,7 @@ if (( ${#MODLIST[*]} )); then modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail fi -for kdir in /lib/modules/[2-3]*; do +for kdir in /usr/lib/modules/[2-3]*; do if [[ ! -d $kdir/kernel ]]; then # found a stale kernel mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*) @@ -51,8 +61,8 @@ if (( ! $# )); then fi for kernver; do - export KERN_DIR=/lib/modules/$kernver/build - export MODULE_DIR=/lib/modules/$kernver/extramodules + export KERN_DIR=/usr/lib/modules/$kernver/build + export MODULE_DIR=/usr/lib/modules/$kernver/extramodules if [[ ! -d $KERN_DIR ]]; then printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \ "$KERN_DIR" |