moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-triggers: dkms: do not fail when a module was previously added.

Browse source
This commit is contained in:
Juan RP 2012-12-17 15:05:25 +01:00
parent 5e62a5e4a9
commit ca88d3e000
2 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
srcpkgs/xbps-triggers/files/dkms
View file

@ -31,7 +31,7 @@ remove_modules()
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
$DKMS status -m "$1" | while read line; do $DKMS status -m "$1" | while read line; do
if $(echo "$line" | egrep -vq '(added|built|installed)'); then if $(echo "$line" | egrep -vq '(added|built|installed)'); then
shift; shift; continue shift 2; continue
fi fi
_modver=$(echo "$line"|sed "s/$1,[[:blank:]]\([^,]*\)[,:].*/\1/;t;d") _modver=$(echo "$line"|sed "s/$1,[[:blank:]]\([^,]*\)[,:].*/\1/;t;d")
_kver=$(echo "$line"|awk '{print $3}'|sed "s/\(.*\),$/\1/") _kver=$(echo "$line"|awk '{print $3}'|sed "s/\(.*\),$/\1/")
@ -43,23 +43,28 @@ remove_modules()
echo "FAILED!" echo "FAILED!"
fi fi
done done
shift; shift; shift 2
done done
} }
add_modules() add_modules()
{ {
local rval=
# Add/build and install the specified modules for all kernels. # Add/build and install the specified modules for all kernels.
set -- ${dkms_modules} set -- ${dkms_modules}
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
$DKMS add -m "$1" -v "$2" >/dev/null 2>&1 $DKMS add -m "$1" -v "$2" >/dev/null 2>&1
if [ $? -eq 0 ]; then rval=$?
if [ $rval -eq 0 ]; then
echo "Added DKMS module '$1-$2'." echo "Added DKMS module '$1-$2'."
elif [ $rval -eq 3 ]; then
echo "DKMS module '$1-$2' already added, skipping."
else else
echo "Failed to add DKMS module: '$1-$2'..." echo "Failed to add DKMS module: '$1-$2'..."
err=1 err=1
fi fi
shift; shift; shift 2
done done
[ -n "$err" ] && exit $err [ -n "$err" ] && exit $err
@ -71,9 +76,18 @@ add_modules()
fi fi
set -- ${dkms_modules} set -- ${dkms_modules}
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
echo -n "Building DKMS module '$1-$2' for kernel-${_kver}... "
$DKMS build -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
if [ $? -eq 0 ]; then
echo "done."
else
echo "FAILED!"
echo "DKMS module '$1-$2' failed to build, please check /var/lib/dkms"
echo "for errors in the log file."
shift 2; continue
fi
echo -n "Installing DKMS module '$1-$2' for kernel-${_kver}... " echo -n "Installing DKMS module '$1-$2' for kernel-${_kver}... "
$DKMS build -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1 && \ $DKMS install -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
$DKMS install -m "$1" -v "$2" -k "${_kver}" >/dev/null 2>&1
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "done." echo "done."
else else
@ -81,7 +95,7 @@ add_modules()
echo "DKMS module '$1-$2' failed to install, please do this manually" echo "DKMS module '$1-$2' failed to install, please do this manually"
echo "and check for errors in the log file." echo "and check for errors in the log file."
fi fi
shift; shift; shift 2
done done
done done
} }

2
srcpkgs/xbps-triggers/template
View file

@ -1,6 +1,6 @@
# Template file for 'xbps-triggers' # Template file for 'xbps-triggers'
pkgname=xbps-triggers pkgname=xbps-triggers
version=0.56 version=0.57
revision=1 revision=1
short_desc="XBPS triggers" short_desc="XBPS triggers"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"