Commit 631d76ad authored by Phil's avatar Phil

fix fileconflict

parent a5eafbd0
......@@ -13,7 +13,7 @@ _kernver=`uname -r`
pkgname=nouveau-drm-lts
_snapdate=20100809
pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
pkgrel=1
pkgrel=2
pkgdesc="nvidia opensource X driver"
arch=('i686' 'x86_64')
url="http://nouveau.freedesktop.org/"
......@@ -35,7 +35,7 @@ provides=("nouveau-drm=$pkgver")
build() {
cd ${srcdir}/master
mkdir nouveau
mkdir -p nouveau
cp $srcdir/Makefile ${srcdir}/master/nouveau/
cd nouveau
make LINUXDIR=/lib/modules/${_kernver}/build DRM_MODULES="nouveau" || return 1
......@@ -45,7 +45,7 @@ build() {
install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nouveau.ko || return 1
install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_kernver}/updates/ttm.ko || return 1
install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_kernver}/updates/ch7006.ko || return 1
install -D -m 0644 ${srcdir}/master/include/drm/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm.h || return 1
install -D -m 0644 ${srcdir}/master/include/drm/nouveau_drm.h ${pkgdir}/usr/include/nouveau_drm-lts.h || return 1
# install script
sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/nouveau-drm.install
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment