--- trunk/include/mtools.sminc 2013/04/07 13:24:55 17041 +++ trunk/include/mtools.sminc 2013/10/09 13:09:29 19668 @@ -1,11 +1,7 @@ # $Id$ # some special build tools -# automatical inherit mtools.minc -# this will provide the service management functions -INHERITS="${INHERITS} mtools" - -# get the pname right with splitpackages +# get the pname right with split-packages mpname() { local pname="${PNAME}" @@ -14,37 +10,6 @@ echo "${pname}" } -# installs initscripts -# minstallrc /path/to/rc-script {destfilename} -minstallrc() -{ - local rcscript - local file - - [[ -z "$1" ]] && die "No initscript given" - - # if no fullpath given use file from sourcedir - if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]] - then - file="${SOURCEDIR}/$(mpname)/$1" - else - file="$1" - fi - - if [[ -n "$2" ]] - then - rcscript="$2" - else - rcscript="$(basename ${file})" - fi - - # needed directory - install -d ${BINDIR}/etc/rc.d/init.d || die - - # install our initscript - install -v -m 0755 -o root -g root ${file} ${BINDIR}/etc/rc.d/init.d/${rcscript} || die -} - # installs environment files # minstallenv /path/to/envdfile {destfilename} minstallenv() @@ -146,153 +111,6 @@ install -v -m 0644 -o root -g root ${file} ${BINDIR}/${destdir}/${etcfile} || die } -minstalludevrule() -{ - local udevrule - local file - local udevrulesddir="/usr/lib/udev/rules.d" - - [[ -z "$1" ]] && die "No udev rule given" - - # if no fullpath given use file from sourcedir - if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]] - then - file="${SOURCEDIR}/$(mpname)/$1" - else - file="$1" - fi - - if [[ -n "$2" ]] - then - udevrule="$2" - else - udevrule="$(basename ${file})" - fi - - # needed directory - install -d ${BINDIR}${udevrulesddir} || die - - # install our udev rule - install -v -m 0644 -o root -g root ${file} ${BINDIR}${udevrulesddir}/${udevrule} || die -} - -minstalludevhelper() -{ - local udevhelper - local file - local udevdir="/usr/lib/udev" - - [[ -z "$1" ]] && die "No udev helper given" - - # if no fullpath given use file from sourcedir - if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]] - then - file="${SOURCEDIR}/$(mpname)/$1" - else - file="$1" - fi - - if [[ -n "$2" ]] - then - udevhelper="$2" - else - udevhelper="$(basename ${file})" - fi - - # needed directory - install -d ${BINDIR}${udevdir} || die - - # install our udev-helper - install -v -m 0755 -o root -g root ${file} ${BINDIR}${udevdir}/${udevhelper} || die -} - -minstallhalinformation() -{ - local halrule - local file - - [[ -z "$1" ]] && die "No hal rule given" - - # if no fullpath given use file from sourcedir - if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]] - then - file="${SOURCEDIR}/$(mpname)/$1" - else - file="$1" - fi - - if [[ -n "$2" ]] - then - halrule="$2" - else - halrule="$(basename ${file})" - fi - - # needed directory - install -d ${BINDIR}/usr/share/hal/fdi/information/20thirdparty || die - - # install our udev rule - install -v -m 0644 -o root -g root ${file} ${BINDIR}/usr/share/hal/fdi/information/20thirdparty/${halrule} || die -} - -minstallhalpolicy() -{ - local halrule - local file - - [[ -z "$1" ]] && die "No hal rule given" - - # if no fullpath given use file from sourcedir - if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]] - then - file="${SOURCEDIR}/$(mpname)/$1" - else - file="$1" - fi - - if [[ -n "$2" ]] - then - halrule="$2" - else - halrule="$(basename ${file})" - fi - - # needed directory - install -d ${BINDIR}/usr/share/hal/fdi/policy/20thirdparty || die - - # install our udev rule - install -v -m 0644 -o root -g root ${file} ${BINDIR}/usr/share/hal/fdi/policy/20thirdparty/${halrule} || die -} - -minstallhalpreprobe() -{ - local halrule - local file - - [[ -z "$1" ]] && die "No hal rule given" - - # if no fullpath given use file from sourcedir - if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]] - then - file="${SOURCEDIR}/$(mpname)/$1" - else - file="$1" - fi - - if [[ -n "$2" ]] - then - halrule="$2" - else - halrule="$(basename ${file})" - fi - - # needed directory - install -d ${BINDIR}/usr/share/hal/fdi/preprobe/10osvendor || die - - # install our udev rule - install -v -m 0644 -o root -g root ${file} ${BINDIR}/usr/share/hal/fdi/preprobe/10osvendor/${halrule} || die -} - # install man files to appropiate dirs # minstallman /path/to/manfile.foo minstallman() @@ -811,69 +629,6 @@ ln ${verbose} -snf ${symlink} ${BINDIR}/${pathto} || die } -# installs systemd units -# minstallunit /path/to/unit-file {destfilename} -minstallunit() -{ - local unit - local file - local systemdunitdir="/usr/lib/systemd/system" - - [[ -z "$1" ]] && die "No unit given" - - # if no fullpath given use file from sourcedir - if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]] - then - file="${SOURCEDIR}/$(mpname)/$1" - else - file="$1" - fi - - if [[ -n "$2" ]] - then - unit="$2" - else - unit="$(basename ${file})" - fi - - # needed directory - install -d ${BINDIR}${prefix}${systemdunitdir} || die - - # install our initscript - install -v -m 0644 -o root -g root ${file} ${BINDIR}${prefix}${systemdunitdir}/${unit} || die -} - -# installs systemd tmp configs to /etc/tmpfiles.d -# minstalltmp /path/to/tmpdfile {destfilename} -minstalltmp() -{ - local tmpdfile - local file - - [[ -z "$1" ]] && die "No tmpd file given" - - # if no fullpath given use file from sourcedir - if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]] - then - file="${SOURCEDIR}/$(mpname)/$1" - else - file="$1" - fi - - if [[ -n "$2" ]] - then - tmpdfile="$2" - else - tmpdfile="$(basename ${file})" - fi - - # needed directory - install -d ${BINDIR}/etc/tmpfiles.d || die - - # install our tmpdfile - install -v -m 0644 -o root -g root ${file} ${BINDIR}/etc/tmpfiles.d/${tmpdfile} || die -} - mclearconfig() { local confdir