[arch-commits] Commit in nouveau-drm-lts/trunk (PKGBUILD nouveau-drm.install)

[Tobias Powalowski]

    Date: Friday, November 11, 2011 @ 11:56:45
  Author: tpowa
Revision: 142529

upgpkg: nouveau-drm-lts 0.0.16_20100313-7

rebuild against latest 2.6.32.48

Modified:
  nouveau-drm-lts/trunk/PKGBUILD
  nouveau-drm-lts/trunk/nouveau-drm.install

---------------------+
 PKGBUILD            |   17 +++++++++--------
 nouveau-drm.install |    8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-11 16:56:38 UTC (rev 142528)
+++ PKGBUILD	2011-11-11 16:56:45 UTC (rev 142529)
@@ -5,8 +5,9 @@
 pkgname=nouveau-drm-lts
 _snapdate=20100313
 pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version
-_kernver='2.6.32-lts'
-pkgrel=6
+_extramodules=extramodules-2.6.32-lts
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
+pkgrel=7
 pkgdesc="nvidia opensource X driver"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
@@ -34,14 +35,14 @@
 }
 
 package() {
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm.ko
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm_kms_helper.ko
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nouveau.ko
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_kernver}/updates/ttm.ko
-  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_kernver}/updates/ch7006.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_extramodules}/updates/drm_kms_helper.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_extramodules}/kernel/drivers/video/nouveau.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ttm.ko
+  install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_extramodules}/updates/ch7006.ko
 
   # install script
-  sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/nouveau-drm.install
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/nouveau-drm.install
   # gzip -9 modules
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
 }

Modified: nouveau-drm.install
===================================================================
--- nouveau-drm.install	2011-11-11 16:56:38 UTC (rev 142528)
+++ nouveau-drm.install	2011-11-11 16:56:45 UTC (rev 142529)
@@ -1,6 +1,6 @@
 post_install() {
-  KERNEL_VERSION='2.6.32-lts'
-  depmod -v $KERNEL_VERSION  > /dev/null 2>&1
+  EXTRAMODULES='extramodules-2.6.32-lts'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)  
   echo "if you are running kms in early mode please rebuild your initrd"
 }
 
@@ -10,7 +10,7 @@
 }
 
 post_remove() {
-  KERNEL_VERSION='2.6.32-lts'
-  depmod -v $KERNEL_VERSION	 > /dev/null 2>&1	 
+  EXTRAMODULES='extramodules-2.6.32-lts'
+  depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }