[arch-commits] Commit in dkms/trunk (02-no-kernel-hook.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Monday, May 13, 2013 @ 00:57:28
  Author: seblu
Revision: 90494

upgpkg: dkms 2.2.0.3-14

https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/

Added:
  dkms/trunk/02-no-kernel-hook.patch
Modified:
  dkms/trunk/PKGBUILD

-------------------------+
 02-no-kernel-hook.patch |   13 +++++++++++++
 PKGBUILD                |   31 ++++++++++++++++---------------
 2 files changed, 29 insertions(+), 15 deletions(-)

Added: 02-no-kernel-hook.patch
===================================================================
--- 02-no-kernel-hook.patch	                        (rev 0)
+++ 02-no-kernel-hook.patch	2013-05-12 22:57:28 UTC (rev 90494)
@@ -0,0 +1,13 @@
+# Author: Sébastien Luttringer <seblu at seblu.net>
+--- a/Makefile	2011-12-07 19:23:51.000000000 +0100
++++ b/Makefile	2013-05-13 00:48:19.620000000 +0200
+@@ -46,9 +46,6 @@
+ 	gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz
+ 	chmod 0644 $(MAN)/dkms.8.gz
+ 	touch --reference=dkms.8 $(MAN)/dkms.8.gz
+-	mkdir   -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d
+-	install -p -m 0755 kernel_prerm.d_dkms  $(KCONF)/prerm.d/dkms
+-	install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms
+ 
+ DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 22:57:07 UTC (rev 90493)
+++ PKGBUILD	2013-05-12 22:57:28 UTC (rev 90494)
@@ -4,7 +4,7 @@
 
 pkgname=dkms
 pkgver=2.2.0.3
-pkgrel=13
+pkgrel=14
 pkgdesc='Dynamic Kernel Modules System'
 arch=('any')
 url='http://linux.dell.com/dkms/'
@@ -18,14 +18,17 @@
         "$pkgname.default"
         "$pkgname.service"
         "$pkgname.systemd"
-        '01-broken-uninstall.patch')
+        '01-broken-uninstall.patch'
+        '02-no-kernel-hook.patch')
 md5sums=('11a8aaade2ebec2803653837c7593030'
          '33be2fbf1bcc1b3fb2f38d9e7eaa809d'
          '02e9744e3fdc3d2f68e46966fb32e260'
          '267632312aa52a190ec0db0758920dd3'
-         '2dfd8656dc79afd229c1481a90fb645b')
+         '2dfd8656dc79afd229c1481a90fb645b'
+         '82d520c39c99c34977e48b313a189c6c')
 
-build() {
+prepare() {
+  # patch
   patches=("$srcdir"/*.patch)
   cd $pkgname-$pkgver
   for p in "${patches[@]}"; do
@@ -37,24 +40,22 @@
   for i in dkms{,_framework.conf,.bash-completion,.8,_common.postinst}; do
     sed -ri 's,/lib/modules,/usr/lib/modules,g' "$i"
   done
+  # fix hardcoded paths
+  sed -i "s|/sbin/depmod|depmod|" dkms
 }
 
 package() {
-  # upstream installer
-  pushd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  popd
-  # fix hardcoded paths
-  sed -i "s|/sbin/depmod|depmod|" $pkgdir/usr/sbin/dkms
-  # remove debian specific
-  rm -r "$pkgdir/etc/kernel"
-  # move bash completion in right place
-  install -d -m 755 "$pkgdir/usr/share/bash-completion"
-  mv "$pkgdir/etc/bash_completion.d" "$pkgdir/usr/share/bash-completion/completions"
   # systemd
   install -D -m 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
   install -D -m 755 $pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$pkgname"
   install -D -m 644 $pkgname.default "$pkgdir/etc/default/$pkgname"
+  # upstream installer
+  cd $pkgname-$pkgver
+  make \
+    DESTDIR="$pkgdir" \
+    SBIN="$pkgdir/usr/bin" \
+    BASHDIR="$pkgdir/usr/share/bash-completion/completions" \
+    install
 }
 
 # vim:set ts=2 sw=2 et: