Commit a5eafbd0 authored by Phil's avatar Phil

fix fileconflict

parent d7cf46d4
......@@ -11,7 +11,7 @@ pkgname=nouveau-drm
_snapdate=20110110
pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
_kernver='2.6.37-CHAKRA'
pkgrel=1
pkgrel=2
pkgdesc="nvidia opensource X driver"
arch=('i686' 'x86_64')
url="http://nouveau.freedesktop.org/"
......@@ -29,12 +29,10 @@ source=(http://chakra-project.org/sources/nouveau-drm/nouveau-drm-${_snapdate}.t
Makefile)
md5sums=('562240412d9688fe620950b6f47994cf'
'948f121d9fbbbaed0d06cb7fa1c9c5b7')
conflicts=('nouveau-drm')
replaces=('nouveau-drm')
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
......
post_install() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.37-CHAKRA'
depmod -v $KERNEL_VERSION > /dev/null 2>&1
echo "if you are running kms in early mode please rebuild your initrd"
}
......@@ -10,7 +10,7 @@ post_upgrade() {
}
post_remove() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.37-CHAKRA'
depmod -v $KERNEL_VERSION > /dev/null 2>&1
}
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