Date: Saturday, October 25, 2014 @ 02:12:10 Author: seblu Revision: 121372
archrelease: copy trunk to community-any Added: dkms/repos/community-any/01-broken-uninstall.patch (from rev 121371, dkms/trunk/01-broken-uninstall.patch) dkms/repos/community-any/02-no-kernel-hook.patch (from rev 121371, dkms/trunk/02-no-kernel-hook.patch) dkms/repos/community-any/03-fix-post-build.patch (from rev 121371, dkms/trunk/03-fix-post-build.patch) dkms/repos/community-any/PKGBUILD (from rev 121371, dkms/trunk/PKGBUILD) dkms/repos/community-any/dkms.default (from rev 121371, dkms/trunk/dkms.default) dkms/repos/community-any/dkms.install (from rev 121371, dkms/trunk/dkms.install) dkms/repos/community-any/dkms.service (from rev 121371, dkms/trunk/dkms.service) dkms/repos/community-any/dkms.systemd (from rev 121371, dkms/trunk/dkms.systemd) Deleted: dkms/repos/community-any/01-broken-uninstall.patch dkms/repos/community-any/02-no-kernel-hook.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 | 26 ++++----- 03-fix-post-build.patch | 24 ++++++++ PKGBUILD | 124 ++++++++++++++++++++++---------------------- dkms.default | 18 +++--- dkms.hook | 12 ---- dkms.install | 26 ++++----- dkms.service | 22 +++---- dkms.systemd | 122 +++++++++++++++++++++---------------------- 9 files changed, 216 insertions(+), 202 deletions(-) Deleted: 01-broken-uninstall.patch =================================================================== --- 01-broken-uninstall.patch 2014-10-25 00:11:51 UTC (rev 121371) +++ 01-broken-uninstall.patch 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 121371, dkms/trunk/01-broken-uninstall.patch) =================================================================== --- 01-broken-uninstall.patch (rev 0) +++ 01-broken-uninstall.patch 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 + } Deleted: 02-no-kernel-hook.patch =================================================================== --- 02-no-kernel-hook.patch 2014-10-25 00:11:51 UTC (rev 121371) +++ 02-no-kernel-hook.patch 2014-10-25 00:12:10 UTC (rev 121372) @@ -1,13 +0,0 @@ -# Author: Sébastien Luttringer <se...@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 - Copied: dkms/repos/community-any/02-no-kernel-hook.patch (from rev 121371, dkms/trunk/02-no-kernel-hook.patch) =================================================================== --- 02-no-kernel-hook.patch (rev 0) +++ 02-no-kernel-hook.patch 2014-10-25 00:12:10 UTC (rev 121372) @@ -0,0 +1,13 @@ +# Author: Sébastien Luttringer <se...@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 + Copied: dkms/repos/community-any/03-fix-post-build.patch (from rev 121371, dkms/trunk/03-fix-post-build.patch) =================================================================== --- 03-fix-post-build.patch (rev 0) +++ 03-fix-post-build.patch 2014-10-25 00:12:10 UTC (rev 121372) @@ -0,0 +1,24 @@ +From 8653e9f44145bbf77d7145bc0c4f9f0c336a7fb9 Mon Sep 17 00:00:00 2001 +From: Darik Horn <dajh...@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: PKGBUILD =================================================================== --- PKGBUILD 2014-10-25 00:11:51 UTC (rev 121371) +++ PKGBUILD 2014-10-25 00:12:10 UTC (rev 121372) @@ -1,61 +0,0 @@ -# $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: Copied: dkms/repos/community-any/PKGBUILD (from rev 121371, dkms/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-10-25 00:12:10 UTC (rev 121372) @@ -0,0 +1,63 @@ +# $Id$ +# Maintainer: Sébastien Luttringer +# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com) + +pkgname=dkms +pkgver=2.2.0.3 +pkgrel=15 +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' + '03-fix-post-build.patch') +md5sums=('11a8aaade2ebec2803653837c7593030' + '33be2fbf1bcc1b3fb2f38d9e7eaa809d' + '02e9744e3fdc3d2f68e46966fb32e260' + '267632312aa52a190ec0db0758920dd3' + '2dfd8656dc79afd229c1481a90fb645b' + '82d520c39c99c34977e48b313a189c6c' + 'fd7cb2119954b3b9d760a8eebd3c583d') + +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 2014-10-25 00:11:51 UTC (rev 121371) +++ dkms.default 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 121371, dkms/trunk/dkms.default) =================================================================== --- dkms.default (rev 0) +++ dkms.default 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 2014-10-25 00:11:51 UTC (rev 121371) +++ dkms.hook 2014-10-25 00:12:10 UTC (rev 121372) @@ -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: Deleted: dkms.install =================================================================== --- dkms.install 2014-10-25 00:11:51 UTC (rev 121371) +++ dkms.install 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 121371, dkms/trunk/dkms.install) =================================================================== --- dkms.install (rev 0) +++ dkms.install 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 2014-10-25 00:11:51 UTC (rev 121371) +++ dkms.service 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 121371, dkms/trunk/dkms.service) =================================================================== --- dkms.service (rev 0) +++ dkms.service 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 2014-10-25 00:11:51 UTC (rev 121371) +++ dkms.systemd 2014-10-25 00:12:10 UTC (rev 121372) @@ -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 121371, dkms/trunk/dkms.systemd) =================================================================== --- dkms.systemd (rev 0) +++ dkms.systemd 2014-10-25 00:12:10 UTC (rev 121372) @@ -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: