[arch-commits] Commit in dkms/repos/community-any (15 files)

Sébastien Luttringer seblu at nymeria.archlinux.org
Sun May 12 18:58:12 EDT 2013


    Date: Monday, May 13, 2013 @ 00:58:12
  Author: seblu
Revision: 90495

archrelease: copy trunk to community-any

Added:
  dkms/repos/community-any/01-broken-uninstall.patch
    (from rev 90494, dkms/trunk/01-broken-uninstall.patch)
  dkms/repos/community-any/02-no-kernel-hook.patch
    (from rev 90494, dkms/trunk/02-no-kernel-hook.patch)
  dkms/repos/community-any/PKGBUILD
    (from rev 90494, dkms/trunk/PKGBUILD)
  dkms/repos/community-any/dkms.default
    (from rev 90494, dkms/trunk/dkms.default)
  dkms/repos/community-any/dkms.hook
    (from rev 90494, dkms/trunk/dkms.hook)
  dkms/repos/community-any/dkms.install
    (from rev 90494, dkms/trunk/dkms.install)
  dkms/repos/community-any/dkms.service
    (from rev 90494, dkms/trunk/dkms.service)
  dkms/repos/community-any/dkms.systemd
    (from rev 90494, dkms/trunk/dkms.systemd)
Deleted:
  dkms/repos/community-any/01-broken-uninstall.patch
  dkms/repos/community-any/PKGBUILD
  dkms/repos/community-any/dkms.default
  dkms/repos/community-any/dkms.hook
  dkms/repos/community-any/dkms.install
  dkms/repos/community-any/dkms.service
  dkms/repos/community-any/dkms.systemd

---------------------------+
 01-broken-uninstall.patch |   44 +++++++--------
 02-no-kernel-hook.patch   |   13 ++++
 PKGBUILD                  |  121 ++++++++++++++++++++++---------------------
 dkms.default              |   18 +++---
 dkms.hook                 |   24 ++++----
 dkms.install              |   26 ++++-----
 dkms.service              |   22 +++----
 dkms.systemd              |  122 ++++++++++++++++++++++----------------------
 8 files changed, 202 insertions(+), 188 deletions(-)

Deleted: 01-broken-uninstall.patch
===================================================================
--- 01-broken-uninstall.patch	2013-05-12 22:57:28 UTC (rev 90494)
+++ 01-broken-uninstall.patch	2013-05-12 22:58:12 UTC (rev 90495)
@@ -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 
- }

Copied: dkms/repos/community-any/01-broken-uninstall.patch (from rev 90494, dkms/trunk/01-broken-uninstall.patch)
===================================================================
--- 01-broken-uninstall.patch	                        (rev 0)
+++ 01-broken-uninstall.patch	2013-05-12 22:58:12 UTC (rev 90495)
@@ -0,0 +1,22 @@
+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 
+ }

Copied: dkms/repos/community-any/02-no-kernel-hook.patch (from rev 90494, dkms/trunk/02-no-kernel-hook.patch)
===================================================================
--- 02-no-kernel-hook.patch	                        (rev 0)
+++ 02-no-kernel-hook.patch	2013-05-12 22:58:12 UTC (rev 90495)
@@ -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
+ 

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 22:57:28 UTC (rev 90494)
+++ PKGBUILD	2013-05-12 22:58:12 UTC (rev 90495)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer <seblu at aur.archlinux.org>
-# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com)
-
-pkgname=dkms
-pkgver=2.2.0.3
-pkgrel=13
-pkgdesc='Dynamic Kernel Modules System'
-arch=('any')
-url='http://linux.dell.com/dkms/'
-license=('GPL2')
-depends=('bash' 'kmod' 'gcc' 'make' 'patch')
-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"
-        "$pkgname.default"
-        "$pkgname.service"
-        "$pkgname.systemd"
-        '01-broken-uninstall.patch')
-md5sums=('11a8aaade2ebec2803653837c7593030'
-         '33be2fbf1bcc1b3fb2f38d9e7eaa809d'
-         '02e9744e3fdc3d2f68e46966fb32e260'
-         '267632312aa52a190ec0db0758920dd3'
-         '2dfd8656dc79afd229c1481a90fb645b')
-
-build() {
-  patches=("$srcdir"/*.patch)
-  cd $pkgname-$pkgver
-  for p in "${patches[@]}"; do
-    msg2 "Apply patch: ${p##*/}"
-    patch -p1 -i "$p"
-  done
-  # /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
-}
-
-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"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: dkms/repos/community-any/PKGBUILD (from rev 90494, dkms/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-12 22:58:12 UTC (rev 90495)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com)
+
+pkgname=dkms
+pkgver=2.2.0.3
+pkgrel=14
+pkgdesc='Dynamic Kernel Modules System'
+arch=('any')
+url='http://linux.dell.com/dkms/'
+license=('GPL2')
+depends=('bash' 'kmod' 'gcc' 'make' 'patch')
+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"
+        "$pkgname.default"
+        "$pkgname.service"
+        "$pkgname.systemd"
+        '01-broken-uninstall.patch'
+        '02-no-kernel-hook.patch')
+md5sums=('11a8aaade2ebec2803653837c7593030'
+         '33be2fbf1bcc1b3fb2f38d9e7eaa809d'
+         '02e9744e3fdc3d2f68e46966fb32e260'
+         '267632312aa52a190ec0db0758920dd3'
+         '2dfd8656dc79afd229c1481a90fb645b'
+         '82d520c39c99c34977e48b313a189c6c')
+
+prepare() {
+  # patch
+  patches=("$srcdir"/*.patch)
+  cd $pkgname-$pkgver
+  for p in "${patches[@]}"; do
+    msg2 "Apply patch: ${p##*/}"
+    patch -p1 -i "$p"
+  done
+  # /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() {
+  # 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:

Deleted: dkms.default
===================================================================
--- dkms.default	2013-05-12 22:57:28 UTC (rev 90494)
+++ dkms.default	2013-05-12 22:58:12 UTC (rev 90495)
@@ -1,9 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-# With LOAD set to yes, modules listed as installed will be loaded with
-# systemctl start dkms.service. Default is yes.
-LOAD=yes
-
-# With UNLOAD set to yes, modules listed as installed will be unloaded with
-# systemctl stop dkms.service. Default is no.
-UNLOAD=no

Copied: dkms/repos/community-any/dkms.default (from rev 90494, dkms/trunk/dkms.default)
===================================================================
--- dkms.default	                        (rev 0)
+++ dkms.default	2013-05-12 22:58:12 UTC (rev 90495)
@@ -0,0 +1,9 @@
+# vim:set ts=2 sw=2 ft=sh noet:
+
+# With LOAD set to yes, modules listed as installed will be loaded with
+# systemctl start dkms.service. Default is yes.
+LOAD=yes
+
+# With UNLOAD set to yes, modules listed as installed will be unloaded with
+# systemctl stop dkms.service. Default is no.
+UNLOAD=no

Deleted: dkms.hook
===================================================================
--- dkms.hook	2013-05-12 22:57:28 UTC (rev 90494)
+++ dkms.hook	2013-05-12 22:58:12 UTC (rev 90495)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-dkms_autoinstall() {
-  export TMPDIR=/dev/shm
-  status 'Starting DKMS autoinstall' dkms autoinstall
-  unset TMPDIR
-}
-
-add_hook single_udevlaunched dkms_autoinstall
-add_hook sysinit_udevlaunched dkms_autoinstall
-
-# vim:set ts=2 sw=2 ft=sh et:

Copied: dkms/repos/community-any/dkms.hook (from rev 90494, dkms/trunk/dkms.hook)
===================================================================
--- dkms.hook	                        (rev 0)
+++ dkms.hook	2013-05-12 22:58:12 UTC (rev 90495)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+dkms_autoinstall() {
+  export TMPDIR=/dev/shm
+  status 'Starting DKMS autoinstall' dkms autoinstall
+  unset TMPDIR
+}
+
+add_hook single_udevlaunched dkms_autoinstall
+add_hook sysinit_udevlaunched dkms_autoinstall
+
+# vim:set ts=2 sw=2 ft=sh et:

Deleted: dkms.install
===================================================================
--- dkms.install	2013-05-12 22:57:28 UTC (rev 90494)
+++ dkms.install	2013-05-12 22:58:12 UTC (rev 90495)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 2.2.0.3-12)" -le 0 ]; then
-    cat << EOF
-===> dkms startup config file moved to /etc/default/dkms
-EOF
-    fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:

Copied: dkms/repos/community-any/dkms.install (from rev 90494, dkms/trunk/dkms.install)
===================================================================
--- dkms.install	                        (rev 0)
+++ dkms.install	2013-05-12 22:58:12 UTC (rev 90495)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  if [ "$(vercmp $2 2.2.0.3-12)" -le 0 ]; then
+    cat << EOF
+===> dkms startup config file moved to /etc/default/dkms
+EOF
+    fi
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Deleted: dkms.service
===================================================================
--- dkms.service	2013-05-12 22:57:28 UTC (rev 90494)
+++ dkms.service	2013-05-12 22:58:12 UTC (rev 90495)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Dynamic Kernel Modules System
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/lib/systemd/scripts/dkms start
-ExecStop=/usr/lib/systemd/scripts/dkms stop
-
-[Install]
-WantedBy=multi-user.target

Copied: dkms/repos/community-any/dkms.service (from rev 90494, dkms/trunk/dkms.service)
===================================================================
--- dkms.service	                        (rev 0)
+++ dkms.service	2013-05-12 22:58:12 UTC (rev 90495)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dynamic Kernel Modules System
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/lib/systemd/scripts/dkms start
+ExecStop=/usr/lib/systemd/scripts/dkms stop
+
+[Install]
+WantedBy=multi-user.target

Deleted: dkms.systemd
===================================================================
--- dkms.systemd	2013-05-12 22:57:28 UTC (rev 90494)
+++ dkms.systemd	2013-05-12 22:58:12 UTC (rev 90495)
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-. /etc/default/dkms
-
-# list dkms modules for the current running kernel
-list_dkms_modules() {
-  shopt -s nullglob
-  declare -a DKMS_MOULES
-  # dkms status needs uname -r to list correctly intalled version for current kernel
-  local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p'))
-  for p in "${modules_path[@]}"; do
-    for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do
-      m=${m##*/}
-      m=${m%.gz}
-      m=${m%.ko}
-      DKMS_MODULES+=("$m")
-    done
-  done
-}
-
-# load installed kernel modules for the current kernel version
-load_dkms_modules() {
-  local ret=0
-  list_dkms_modules
-  for m in "${DKMS_MODULES[@]}"; do
-    modprobe "$m"
-    ret+=$?
-  done
-  return $ret
-}
-
-# unload installed kernel modules for the current kernel version
-unload_dkms_modules() {
-  list_dkms_modules
-  # ask for removal
-  for m in "${DKMS_MODULES[@]}"; do
-    modprobe --remove --quiet "$m"
-  done
-  # check modules are unloaded
-  # sometimes modprobe -r fail but modules are removed
-  for m in "${DKMS_MODULES[@]}"; do
-    [[ -e /sys/modules/$m ]] && return 1
-  done
-  return 0
-}
-
-case "$1" in
-  start)
-    dkms autoinstall -k "$(uname -r)"
-    [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules
-  ;;
-  stop)
-    [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules
-  ;;
-  *)
-    echo "usage: $0 {start|stop}" >&2
-  ;;
-esac
-
-:
-# vim:set ts=2 sw=2 ft=sh et:

Copied: dkms/repos/community-any/dkms.systemd (from rev 90494, dkms/trunk/dkms.systemd)
===================================================================
--- dkms.systemd	                        (rev 0)
+++ dkms.systemd	2013-05-12 22:58:12 UTC (rev 90495)
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+. /etc/default/dkms
+
+# list dkms modules for the current running kernel
+list_dkms_modules() {
+  shopt -s nullglob
+  declare -a DKMS_MOULES
+  # dkms status needs uname -r to list correctly intalled version for current kernel
+  local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p'))
+  for p in "${modules_path[@]}"; do
+    for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do
+      m=${m##*/}
+      m=${m%.gz}
+      m=${m%.ko}
+      DKMS_MODULES+=("$m")
+    done
+  done
+}
+
+# load installed kernel modules for the current kernel version
+load_dkms_modules() {
+  local ret=0
+  list_dkms_modules
+  for m in "${DKMS_MODULES[@]}"; do
+    modprobe "$m"
+    ret+=$?
+  done
+  return $ret
+}
+
+# unload installed kernel modules for the current kernel version
+unload_dkms_modules() {
+  list_dkms_modules
+  # ask for removal
+  for m in "${DKMS_MODULES[@]}"; do
+    modprobe --remove --quiet "$m"
+  done
+  # check modules are unloaded
+  # sometimes modprobe -r fail but modules are removed
+  for m in "${DKMS_MODULES[@]}"; do
+    [[ -e /sys/modules/$m ]] && return 1
+  done
+  return 0
+}
+
+case "$1" in
+  start)
+    dkms autoinstall -k "$(uname -r)"
+    [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules
+  ;;
+  stop)
+    [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules
+  ;;
+  *)
+    echo "usage: $0 {start|stop}" >&2
+  ;;
+esac
+
+:
+# vim:set ts=2 sw=2 ft=sh et:



More information about the arch-commits mailing list