[arch-commits] Commit in dkms/trunk (4 files)

Sébastien Luttringer seblu at archlinux.org
Fri Oct 23 16:50:15 UTC 2015


    Date: Friday, October 23, 2015 @ 18:50:14
  Author: seblu
Revision: 144800

upgpkg: dkms 2.2.0.3+git151023-1

Switching to dkms git master tree. Last release was 4 years ago.
Upstream has integrated 50 patches with bugfixes and features.

Modified:
  dkms/trunk/PKGBUILD
Deleted:
  dkms/trunk/01-broken-uninstall.patch
  dkms/trunk/03-fix-post-build.patch
  dkms/trunk/04-no-action-usage.patch

---------------------------+
 01-broken-uninstall.patch |   22 ----------------------
 03-fix-post-build.patch   |   24 ------------------------
 04-no-action-usage.patch  |   16 ----------------
 PKGBUILD                  |   41 ++++++++++++++++++-----------------------
 4 files changed, 18 insertions(+), 85 deletions(-)

Deleted: 01-broken-uninstall.patch
===================================================================
--- 01-broken-uninstall.patch	2015-10-23 16:08:39 UTC (rev 144799)
+++ 01-broken-uninstall.patch	2015-10-23 16:50:14 UTC (rev 144800)
@@ -1,22 +0,0 @@
-diff --git a/dkms b/dkms
-index abb01a4..265b69a 100644
---- a/dkms
-+++ b/dkms
-@@ -162,11 +162,14 @@ set_kernel_source_dir()
- 
- # A little test function for DKMS commands that only work on one kernel.
- have_one_kernel() {
--    (( ${#kernelver[@]} > 1 )) && \
--	die 4 $"The action $1 does not support multiple kernel version" \
--	$"parameters on the command line."
--    [[ $all ]] && die 5 $"The action $1 does not support the --all" \
--	$"parameter."
-+       if (( ${#kernelver[@]} != 1 )); then
-+	  die 4 $"The action $1 does not support multiple kernel version" \
-+	  $"parameters on the command line."
-+       fi
-+       if [[ $all ]]; then  
-+           die 5 $"The action $1 does not support the --all" \
-+	   $"parameter."
-+       fi 
- }

Deleted: 03-fix-post-build.patch
===================================================================
--- 03-fix-post-build.patch	2015-10-23 16:08:39 UTC (rev 144799)
+++ 03-fix-post-build.patch	2015-10-23 16:50:14 UTC (rev 144800)
@@ -1,24 +0,0 @@
-From 8653e9f44145bbf77d7145bc0c4f9f0c336a7fb9 Mon Sep 17 00:00:00 2001
-From: Darik Horn <dajhorn at vanadac.com>
-Date: Mon, 27 Feb 2012 20:45:37 -0600
-Subject: Add POST_BUILD to the dkms_conf_variables list.
-
-The POST_BUILD directive is ignored by the read_conf() function
-because it not in dkms_conf_variables list.
-
-diff --git a/dkms b/dkms
-index 4019c50..02aef34 100644
---- a/dkms
-+++ b/dkms
-@@ -23,7 +23,7 @@
- # All of the variables we will accept from dkms.conf.
- # Does not include directives
- readonly dkms_conf_variables="CLEAN REMAKE_INITRD remake_initrd PACKAGE_NAME
--       PACKAGE_VERSION POST_ADD POST_INSTALL POST_REMOVE PRE_BUILD
-+       PACKAGE_VERSION POST_ADD POST_BUILD POST_INSTALL POST_REMOVE PRE_BUILD
-        PRE_INSTALL BUILD_EXCLUSIVE_KERNEL BUILD_EXCLUSIVE_ARCH
-        build_exclude OBSOLETE_BY MAKE MAKE_MATCH MODULES_CONF
-        modules_conf_array PATCH PATCH_MATCH patch_array BUILT_MODULE_NAME
--- 
-cgit v0.10
-

Deleted: 04-no-action-usage.patch
===================================================================
--- 04-no-action-usage.patch	2015-10-23 16:08:39 UTC (rev 144799)
+++ 04-no-action-usage.patch	2015-10-23 16:50:14 UTC (rev 144800)
@@ -1,16 +0,0 @@
-# Copyright: Sébastien Luttringer <seblu at seblu.net>
---- a/dkms	2015-10-23 13:57:36.624685834 +0200
-+++ b/dkms	2015-10-23 17:54:39.495367417 +0200
-@@ -3465,6 +3465,12 @@
- 
- # Sanity checking
- 
-+# No action, we exit
-+if [[ -z $action ]]; then
-+    show_usage
-+    die 4 $"No action was specified."
-+fi
-+
- # Error out if binaries-only is set and source-only is set
- if [[ $binaries_only && $source_only ]]; then
-     die 8 $" You have specified both --binaries-only and --source-only." \

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-23 16:08:39 UTC (rev 144799)
+++ PKGBUILD	2015-10-23 16:50:14 UTC (rev 144800)
@@ -3,49 +3,44 @@
 # Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com)
 
 pkgname=dkms
-pkgver=2.2.0.3
-pkgrel=16
+pkgver=2.2.0.3+git151023
+pkgrel=1
 pkgdesc='Dynamic Kernel Modules System'
 arch=('any')
 url='http://linux.dell.com/dkms/'
 license=('GPL2')
 depends=('bash' 'kmod' 'gcc' 'make' 'patch')
+makedepends=('git')
 optdepends=('linux-headers: build modules against Arch kernel'
             'linux-lts-headers: build modules against LTS Arch kernel')
 backup=('etc/dkms/framework.conf' 'etc/default/dkms')
 install=$pkgname.install
-source=("http://linux.dell.com/$pkgname/permalink/$pkgname-$pkgver.tar.gz"
+source=('git+git://linux.dell.com/dkms.git#commit=7b6e78f'
+        '02-no-kernel-hook.patch'
         "$pkgname.default"
         "$pkgname.service"
-        "$pkgname.systemd"
-        '01-broken-uninstall.patch'
-        '02-no-kernel-hook.patch'
-        '03-fix-post-build.patch'
-        '04-no-action-usage.patch')
-md5sums=('11a8aaade2ebec2803653837c7593030'
+        "$pkgname.systemd")
+md5sums=('SKIP'
+         '82d520c39c99c34977e48b313a189c6c'
          '33be2fbf1bcc1b3fb2f38d9e7eaa809d'
          '02e9744e3fdc3d2f68e46966fb32e260'
-         '0158265dace30b6cdd06244e844b3e5f'
-         '2dfd8656dc79afd229c1481a90fb645b'
-         '82d520c39c99c34977e48b313a189c6c'
-         'fd7cb2119954b3b9d760a8eebd3c583d'
-         'b54ad33d0e8213fd1c37be723cc0ef7c')
+         '0158265dace30b6cdd06244e844b3e5f')
 
 prepare() {
-  # patch
+  cd dkms
+  # patching
   patches=("$srcdir"/*.patch)
-  cd $pkgname-$pkgver
-  for p in "${patches[@]}"; do
-    msg2 "Apply patch: ${p##*/}"
-    patch -p1 -i "$p"
-  done
+  if (( ${#patches[*]} > 0 )); then
+    for p in "${patches[@]}"; do
+      msg2 "Apply patch: ${p##*/}"
+      patch -p1 -i "$p"
+    done
+  fi
   # /usr move
   msg2 '/usr move patching'
   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() {
@@ -54,7 +49,7 @@
   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
+  cd dkms
   make \
     DESTDIR="$pkgdir" \
     SBIN="$pkgdir/usr/bin" \



More information about the arch-commits mailing list