Date: Wednesday, March 16, 2016 @ 00:14:57 Author: seblu Revision: 261682
upgpkg: dkms 2.2.0.3+git151023-9 - quiet dkms output - display dkms command run - fix FS#48580 Modified: dkms/trunk/PKGBUILD dkms/trunk/hook.sh ----------+ PKGBUILD | 4 ++-- hook.sh | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-03-15 21:44:46 UTC (rev 261681) +++ PKGBUILD 2016-03-15 23:14:57 UTC (rev 261682) @@ -4,7 +4,7 @@ pkgname=dkms pkgver=2.2.0.3+git151023 -pkgrel=8 +pkgrel=9 pkgdesc='Dynamic Kernel Modules System' arch=('any') url='http://linux.dell.com/dkms/' @@ -26,7 +26,7 @@ '82d520c39c99c34977e48b313a189c6c' 'e6eada07fc3a56a491e14dfeafec746f' '57d90c89a221c52d78d0ec3953fe2fcf' - '5e5b2ca4bea3dfcaed67eec07d152381') + '297fa3df7770d46aca6b0457ddb7cfad') prepare() { cd dkms Modified: hook.sh =================================================================== --- hook.sh 2016-03-15 21:44:46 UTC (rev 261681) +++ hook.sh 2016-03-15 23:14:57 UTC (rev 261682) @@ -17,6 +17,12 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# display what to run and run it +run() { + echo "==> $*" + "$@" +} + # check kernel is valid for action # it means kernel and its headers are installed # $1: kernel version @@ -23,12 +29,10 @@ check_kernel() { local kver="$1"; shift if [[ ! -d "$install_tree/$kver/kernel" ]]; then - echo "==> Kernel $kver modules are missing. Nothing will be done for this kernel!" - echo '==> You have to install the matching kernel package to use dkms' + echo "==> No kernel $kver modules. You must install them to use DKMS!" return 1 elif [[ ! -d "$install_tree/$kver/build/include" ]]; then - echo "==> Kernel $kver headers are missing. Nothing will be done for this kernel!" - echo '==> You have to install the matching kernel headers package to use dkms' + echo "==> No kernel $kver headers. You must install them to use DKMS!" return 1 fi return 0 @@ -46,8 +50,8 @@ local path for path in */build/; do local kver="${path%%/*}" - check_kernel "$kver" || return - dkms "$@" -m "$modname" -v "$modver" -k "$kver" + check_kernel "$kver" || continue + run dkms -q "$@" -m "$modname" -v "$modver" -k "$kver" done popd >/dev/null } @@ -62,7 +66,7 @@ local path for path in "$source_tree"/*-*/dkms.conf; do if [[ "$path" =~ ^$source_tree/([^/]+)-([^/]+)/dkms\.conf$ ]]; then - dkms "$@" -m "${BASH_REMATCH[1]}" -v "${BASH_REMATCH[2]}" -k "$kver" + run dkms -q "$@" -m "${BASH_REMATCH[1]}" -v "${BASH_REMATCH[2]}" -k "$kver" fi done }