--- trunk/ati-drivers/ati-module.sh 2008/02/11 10:53:47 474 +++ trunk/ati-drivers/ati-module.sh 2008/02/11 13:14:04 475 @@ -1,5 +1,5 @@ #!/bin/bash -# $Header: /root/magellan-cvs/src/ati-drivers/ati-module.sh,v 1.1 2008-02-11 10:53:47 niro Exp $ +# $Header: /root/magellan-cvs/src/ati-drivers/ati-module.sh,v 1.2 2008-02-11 13:14:04 niro Exp $ # Compiles nvidia-drivers for given kernel die() { echo -e "${COLRED}$@${COLDEFAULT}"; exit 1; } @@ -76,8 +76,8 @@ # some sane defaults [[ -z ${KERNEL_VERSION} ]] && KERNEL_VERSION="$(uname -r)" [[ -z ${KERNEL_SOURCES} ]] && KERNEL_SOURCES="/lib/modules/${KERNEL_VERSION}/source" -KERNEL_MODULE_DEST="/lib/modules/${KERNEL_VERSION}/source/video" -KERNEL_MODULE_SUFFIX="$(mod_suffix ${SRCDIR})" +KERNEL_MODULE_DEST="/lib/modules/${KERNEL_VERSION}/video" +KERNEL_MODULE_SUFFIX="$(mod_suffix ${KERNEL_SOURCES})" if [[ -f ${KERNEL_MODULE_DEST}/${KERNEL_MODULE}.${KERNEL_MODULE_SUFFIX} ]] then @@ -91,10 +91,10 @@ cd ${SRCDIR} mecho "Compiling ${KERNEL_MODULE}-module for kernel ${KERNEL_VERSION} ..." -local gcc_major="$(gcc --version | grep gcc | cut -d' ' -f3|cut -d. -f1)" +gcc_major="$(gcc --version | grep gcc | cut -d' ' -f3|cut -d. -f1)" export _POSIX2_VERSION="199209" [[ $(kernel_major_version ${KERNEL_SOURCES}) = 2.6 ]] && cp 2.6.x/Makefile ${SRCDIR} -make -C ${KERNEL_SOURCES} M="$(pwd)" GCC_VER_MAJ="${gcc_major}" modules || die +make -C ${KERNEL_SOURCES} V=0 M="$(pwd)" GCC_VER_MAJ="${gcc_major}" modules || die mecho "Installing ${KERNEL_MODULE}-module into ${KERNEL_MODULE_DEST} ..." install -d ${KERNEL_MODULE_DEST} || die