On Jan 30, 2008 8:27 PM, Michael Biebl <[EMAIL PROTECTED]> wrote:
> 2008/1/31, Michael Biebl <[EMAIL PROTECTED]>:
> > One way to simplify this is as follows:
> >
> > sleep_in_scripts = foo.in bar.in baz.in
> > sleep_SCRIPTS=$(sleep_in_scripts:.in=)
> > CLEANFILES=$(sleep_SCRIPTS)
> > do_subst = ...
> > %: %.in Makefile
> > $(do_subst) $< > $@
> >
> > %: %.in is a gnu make extension though.
It turns out that there is a POSIX-ish way of doing this (I think).
> Oh, and pm/functions sources /usr/lib/pm-utils/defaults and uses fixed
> paths like /etc/pm
> in souce_configs and /usr/lib/pm-utils in find_hooks.
Patch attached. This applies over the top of the previous patch.
It is also largeish due to the rename of functions to functions.in.
Also removed the executable bits from the .in files to emphasize their
non-executability.
> Cheers,
> Michael
> --
> Why is it that all of the instruments seeking intelligent life in the
> universe are pointed away from Earth?
>
diff --git a/pm/Makefile.am b/pm/Makefile.am
index a063dbb..b175ebf 100644
--- a/pm/Makefile.am
+++ b/pm/Makefile.am
@@ -9,6 +9,13 @@ extra_SCRIPTS = \
EXTRA_DIST = \
$(extra_SCRIPTS)
+do_function_transform = sed -e 's,[EMAIL PROTECTED]@],$(extradir),g' \
+ -e 's,[EMAIL PROTECTED]@],$(sysconfdir),g'
+
+functions: functions.in Makefile
+ $(do_function_transform) <$(srcdir)/[EMAIL PROTECTED] >$@
+ chmod +x $@
+
install-exec-local:
-mkdir $(DESTDIR)$(sysconfdir)/pm/config.d
diff --git a/pm/functions b/pm/functions
deleted file mode 100755
index 76aafd1..0000000
--- a/pm/functions
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/bin/sh
-# vim:noexpandtab
-
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/pm-utils/bin
-
-# Default values go here. It is important to _not_ initialize some
-# variables here. They are:
-#
-# PM_CMDLINE
-# RESUME_MODULES
-#
-set -a
-HIBERNATE_MODE="platform"
-HIBERNATE_RESUME_POST_VIDEO=no
-INHIBIT=/var/run/pm-utils.inhibit
-PM_LOGFILE=${PM_LOGFILE:=/var/log/pm-suspend.log}
-SUSPEND_MODULES=""
-TEMPORARY_CPUFREQ_GOVERNOR="performance"
-LOCK="/var/run/pm-utils/lock"
-STORAGEDIR="/var/run/pm-utils/storage"
-
-# Use c sort order
-export LC_COLLATE=C
-
-[ -f /usr/lib/pm-utils/defaults ] && . /usr/lib/pm-utils/defaults
-set +a
-
-
-source_configs()
-{
- for cfg in /etc/pm/config.d/*[!~] ; do
- [ -f "$cfg" ] || continue
- set -a
- . "${cfg}"
- set +a
- done
-}
-
-source_configs
-
-# try to take the lock. Fail if we cannot get it.
-try_lock()
-{
- # $1 = file to use as lockfile
- # $2 (optional) content to write to the lockfile,
- # extra newline will be appended
- # make sure the directory where the lockfile should be exists
- mkdir -p ${1%/*}
- # we use noclobber to make sure there are no race conditions
- (set -o noclobber; echo "${2}" > "${1}") 2> /dev/null || return 1
- return 0
-}
-
-# spin waiting for the lock with optional timeout.
-# return once we have it, or the timeout has expired
-spin_lock()
-{
- # $1 = lockfile
- # $2 = optional timeout
- local elapsed=0
- while ! try_lock $1; do
- [ "x$2" != "x" ] && [ $(( $elapsed == $2 )) -ne 0 ] && return 1
- elapsed=$(($elapsed + 1))
- sleep 1;
- done
-}
-
-# release the lock
-release_lock()
-{
- # $1 = lockfile
- # make sure it is ours first.
- rm -rf "$1"
- return $?
-}
-
-
-take_suspend_lock()
-{
- VT=$(fgconsole)
- chvt 63
- try_lock "$LOCK" || return 1
- mkdir -p "${STORAGEDIR}"
- return 0
-}
-
-remove_suspend_lock()
-{
- rm -rf "${STORAGEDIR}"
- chvt 1
- chvt $VT
- release_lock "${LOCK}"
-}
-
-
-command_exists()
-{
- # $1 = command to test for. It can be an executable in the path,
- # a shell function, or a shell builtin.
- type "$1" >/dev/null 2>&1
- return $?
-}
-
-find_hooks() {
- # $1 = type of hook to find.
- # Currently only power and sleep are meaningful.
- local syshooks="/etc/pm/$1.d"
- local phooks="/usr/lib/pm-utils/$1.d"
- local base
-
- for base in $(for f in $syshooks/*[!~] $phooks/*[!~];
- do [ -f "$f" ] && echo ${f##*/} ; done | sort | uniq) ;
- do
- if [ -x "$syshooks/$base" ]; then
- echo $syshooks/$base
- elif [ -x "$phooks/$base" ]; then
- echo $phooks/$base
- fi
- done
-}
-
-run_hooks() {
- # $1 = hooks to run
- # $2 = parameters to pass to hooks
- # $3 = if $3 = "reverse", then also run the hooks that ran sucessfully
- # backwards with parameters in $4
- # $4 = parameters to pass to scripts when running backwards
- echo "$(date): running $1 hooks."
- local hooks="$1"
- local params="$2"
- shift; shift
- local revhooks
- local file
- for file in $(find_hooks "${hooks}"); do
- echo "===== $(date): running hook: $file $params ====="
- "$file" $params && revhooks="${file}${revhooks:+" ${revhooks}"}"
- done
- echo "$(date): done running $hooks:$params hooks."
- if [ "x$1" = "xreverse" ]; then
- echo "$(date): running $hooks hooks backwards."
- for file in $revhooks; do
- echo "===== $(date): running hook :$file $2 ====="
- "${file}" $2
- done
- echo "$(date): done running $hooks:$2 backwards"
- fi
-}
-
-get_power_status()
-{
- RETVAL=0
- on_ac_power
- case "$?" in
- "0")
- echo "ac"
- ;;
- "1")
- echo "battery"
- ;;
- "255")
- echo "error"
- RETVAL=1
- ;;
- esac
- return $RETVAL
-}
-
-do_suspend()
-{
- pm-pmu --suspend || echo -n "mem" > /sys/power/state
-}
-
-do_hibernate()
-{
- echo -n "${HIBERNATE_MODE}" > /sys/power/disk
- echo -n "disk" > /sys/power/state
-}
-
-do_suspend_hybrid()
-{
- return 1
-}
-
-init_logfile() {
- if [ -n "$1" ]; then
- exec > "$1" 2>&1
- fi
-}
-
-pm_main()
-{
- init_logfile "$PM_LOGFILE"
- take_suspend_lock || exit 1
-
- # make sure that our locks are unlocked no matter how the script exits
- trap remove_suspend_lock 0
-
- rm -f "$INHIBIT"
-
- run_hooks sleep "$1" reverse "$2"
-
- return 0
-}
-
-_rmmod() {
- if modprobe -r $1; then
- touch "${STORAGEDIR}/module:$1"
- return 0
- else
- echo "# could not unload '$1', usage count was $2"
- return 1
- fi
-}
-
-# this recursively unloads the given modules and all that depend on it
-# first parameter is the module to be unloaded
-modunload()
-{
- local MOD D C USED MODS I
- local UNL="$(echo $1 |tr - _)" RET=1
-
- while read MOD D C USED D; do
- [ "$MOD" = "$UNL" ] || continue
- if [ "$USED" = "-" ]; then
- # no dependent modules, just try to remove this one.
- _rmmod "$MOD" $C
- RET=$?
- else
- # modules depend on this one. try to remove them first.
- MODS="${USED%%*,}"
- while [ "${MODS}" ]; do
- # try to unload the last one first
- MOD="${MODS##*,}"
- modunload $MOD && RET=0
- # prune the last one from the list
- MODS="${MODS%,*}"
- done
- # if we unloaded at least one module, then let's
- # try again!
- [ $RET -eq 0 ] && modunload $MOD
- RET=$?
- fi
- return $RET
- done < /proc/modules
- # if we came this far, there was nothing to do,
- # the module is no longer loaded.
- return 0
-}
-
-# reload all the modules in no particular order.
-modreload()
-{
- for x in ${STORAGEDIR}/module:* ; do
- [ -f "${x}" ] && modprobe "${x##*:}" >/dev/null 2>&1
- done
-}
-
-if ! command_exists service; then
- service() {
- if [ -x "/etc/init.d/$1" ]; then
- "/etc/init.d/$@"
- else
- echo "$1" $": unrecognized service" 1>&2
- return 1
- fi
- }
-fi
-
-stopservice()
-{
- if service "$1" status 2>/dev/null | grep -c -q running; then
- touch "${STORAGEDIR}/service:$1"
- service "$1" stop
- fi
-}
-
-restartservice()
-{
- [ -f "${STORAGEDIR}/service:$1" ] && service "$1" start
-}
-
-savestate()
-{
- echo "$2" > "${STORAGEDIR}/state:$1"
-}
-
-restorestate()
-{
- cat "${STORAGEDIR}/state:${1}"
-}
diff --git a/pm/functions.in b/pm/functions.in
new file mode 100644
index 0000000..0c59b65
--- /dev/null
+++ b/pm/functions.in
@@ -0,0 +1,290 @@
+#!/bin/sh
+# vim:noexpandtab
+
+export PATH=/sbin:/usr/sbin:/bin:/usr/bin:@PM-UTILS-LIBDIR@/bin
+
+# Default values go here. It is important to _not_ initialize some
+# variables here. They are:
+#
+# PM_CMDLINE
+# RESUME_MODULES
+#
+set -a
+HIBERNATE_MODE="platform"
+HIBERNATE_RESUME_POST_VIDEO=no
+INHIBIT=/var/run/pm-utils.inhibit
+PM_LOGFILE=${PM_LOGFILE:=/var/log/pm-suspend.log}
+SUSPEND_MODULES=""
+TEMPORARY_CPUFREQ_GOVERNOR="performance"
+LOCK="/var/run/pm-utils/lock"
+STORAGEDIR="/var/run/pm-utils/storage"
+
+# Use c sort order
+export LC_COLLATE=C
+
+[ -f @PM-UTILS-LIBDIR@/defaults ] && . @PM-UTILS-LIBDIR@/defaults
+set +a
+
+
+source_configs()
+{
+ for cfg in @PM-UTILS-SYSCONFDIR@/pm/config.d/*[!~] ; do
+ [ -f "$cfg" ] || continue
+ set -a
+ . "${cfg}"
+ set +a
+ done
+}
+
+source_configs
+
+# try to take the lock. Fail if we cannot get it.
+try_lock()
+{
+ # $1 = file to use as lockfile
+ # $2 (optional) content to write to the lockfile,
+ # extra newline will be appended
+ # make sure the directory where the lockfile should be exists
+ mkdir -p ${1%/*}
+ # we use noclobber to make sure there are no race conditions
+ (set -o noclobber; echo "${2}" > "${1}") 2> /dev/null || return 1
+ return 0
+}
+
+# spin waiting for the lock with optional timeout.
+# return once we have it, or the timeout has expired
+spin_lock()
+{
+ # $1 = lockfile
+ # $2 = optional timeout
+ local elapsed=0
+ while ! try_lock $1; do
+ [ "x$2" != "x" ] && [ $(( $elapsed == $2 )) -ne 0 ] && return 1
+ elapsed=$(($elapsed + 1))
+ sleep 1;
+ done
+}
+
+# release the lock
+release_lock()
+{
+ # $1 = lockfile
+ # make sure it is ours first.
+ rm -rf "$1"
+ return $?
+}
+
+
+take_suspend_lock()
+{
+ VT=$(fgconsole)
+ chvt 63
+ try_lock "$LOCK" || return 1
+ mkdir -p "${STORAGEDIR}"
+ return 0
+}
+
+remove_suspend_lock()
+{
+ rm -rf "${STORAGEDIR}"
+ chvt 1
+ chvt $VT
+ release_lock "${LOCK}"
+}
+
+
+command_exists()
+{
+ # $1 = command to test for. It can be an executable in the path,
+ # a shell function, or a shell builtin.
+ type "$1" >/dev/null 2>&1
+ return $?
+}
+
+find_hooks() {
+ # $1 = type of hook to find.
+ # Currently only power and sleep are meaningful.
+ local syshooks="@PM-UTILS-SYSCONFDIR@/pm/$1.d"
+ local phooks="@PM-UTILS-LIBDIR@/$1.d"
+ local base
+
+ for base in $(for f in $syshooks/*[!~] $phooks/*[!~];
+ do [ -f "$f" ] && echo ${f##*/} ; done | sort | uniq) ;
+ do
+ if [ -x "$syshooks/$base" ]; then
+ echo $syshooks/$base
+ elif [ -x "$phooks/$base" ]; then
+ echo $phooks/$base
+ fi
+ done
+}
+
+run_hooks() {
+ # $1 = hooks to run
+ # $2 = parameters to pass to hooks
+ # $3 = if $3 = "reverse", then also run the hooks that ran sucessfully
+ # backwards with parameters in $4
+ # $4 = parameters to pass to scripts when running backwards
+ echo "$(date): running $1 hooks."
+ local hooks="$1"
+ local params="$2"
+ shift; shift
+ local revhooks
+ local file
+ for file in $(find_hooks "${hooks}"); do
+ echo "===== $(date): running hook: $file $params ====="
+ "$file" $params && revhooks="${file}${revhooks:+" ${revhooks}"}"
+ done
+ echo "$(date): done running $hooks:$params hooks."
+ if [ "x$1" = "xreverse" ]; then
+ echo "$(date): running $hooks hooks backwards."
+ for file in $revhooks; do
+ echo "===== $(date): running hook :$file $2 ====="
+ "${file}" $2
+ done
+ echo "$(date): done running $hooks:$2 backwards"
+ fi
+}
+
+get_power_status()
+{
+ RETVAL=0
+ on_ac_power
+ case "$?" in
+ "0")
+ echo "ac"
+ ;;
+ "1")
+ echo "battery"
+ ;;
+ "255")
+ echo "error"
+ RETVAL=1
+ ;;
+ esac
+ return $RETVAL
+}
+
+do_suspend()
+{
+ pm-pmu --suspend || echo -n "mem" > /sys/power/state
+}
+
+do_hibernate()
+{
+ echo -n "${HIBERNATE_MODE}" > /sys/power/disk
+ echo -n "disk" > /sys/power/state
+}
+
+do_suspend_hybrid()
+{
+ return 1
+}
+
+init_logfile() {
+ if [ -n "$1" ]; then
+ exec > "$1" 2>&1
+ fi
+}
+
+pm_main()
+{
+ init_logfile "$PM_LOGFILE"
+ take_suspend_lock || exit 1
+
+ # make sure that our locks are unlocked no matter how the script exits
+ trap remove_suspend_lock 0
+
+ rm -f "$INHIBIT"
+
+ run_hooks sleep "$1" reverse "$2"
+
+ return 0
+}
+
+_rmmod() {
+ if modprobe -r $1; then
+ touch "${STORAGEDIR}/module:$1"
+ return 0
+ else
+ echo "# could not unload '$1', usage count was $2"
+ return 1
+ fi
+}
+
+# this recursively unloads the given modules and all that depend on it
+# first parameter is the module to be unloaded
+modunload()
+{
+ local MOD D C USED MODS I
+ local UNL="$(echo $1 |tr - _)" RET=1
+
+ while read MOD D C USED D; do
+ [ "$MOD" = "$UNL" ] || continue
+ if [ "$USED" = "-" ]; then
+ # no dependent modules, just try to remove this one.
+ _rmmod "$MOD" $C
+ RET=$?
+ else
+ # modules depend on this one. try to remove them first.
+ MODS="${USED%%*,}"
+ while [ "${MODS}" ]; do
+ # try to unload the last one first
+ MOD="${MODS##*,}"
+ modunload $MOD && RET=0
+ # prune the last one from the list
+ MODS="${MODS%,*}"
+ done
+ # if we unloaded at least one module, then let's
+ # try again!
+ [ $RET -eq 0 ] && modunload $MOD
+ RET=$?
+ fi
+ return $RET
+ done < /proc/modules
+ # if we came this far, there was nothing to do,
+ # the module is no longer loaded.
+ return 0
+}
+
+# reload all the modules in no particular order.
+modreload()
+{
+ for x in ${STORAGEDIR}/module:* ; do
+ [ -f "${x}" ] && modprobe "${x##*:}" >/dev/null 2>&1
+ done
+}
+
+if ! command_exists service; then
+ service() {
+ if [ -x "/etc/init.d/$1" ]; then
+ "/etc/init.d/$@"
+ else
+ echo "$1" $": unrecognized service" 1>&2
+ return 1
+ fi
+ }
+fi
+
+stopservice()
+{
+ if service "$1" status 2>/dev/null | grep -c -q running; then
+ touch "${STORAGEDIR}/service:$1"
+ service "$1" stop
+ fi
+}
+
+restartservice()
+{
+ [ -f "${STORAGEDIR}/service:$1" ] && service "$1" start
+}
+
+savestate()
+{
+ echo "$2" > "${STORAGEDIR}/state:$1"
+}
+
+restorestate()
+{
+ cat "${STORAGEDIR}/state:${1}"
+}
diff --git a/pm/sleep.d/00clear.in b/pm/sleep.d/00clear.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/00logging.in b/pm/sleep.d/00logging.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/05led.in b/pm/sleep.d/05led.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/10NetworkManager.in b/pm/sleep.d/10NetworkManager.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/20video.in b/pm/sleep.d/20video.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/49bluetooth.in b/pm/sleep.d/49bluetooth.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/50modules.in b/pm/sleep.d/50modules.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/55battery.in b/pm/sleep.d/55battery.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/65alsa.in b/pm/sleep.d/65alsa.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/90clock.in b/pm/sleep.d/90clock.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/94cpufreq.in b/pm/sleep.d/94cpufreq.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/95led.in b/pm/sleep.d/95led.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/99video.in b/pm/sleep.d/99video.in
old mode 100755
new mode 100644
diff --git a/pm/sleep.d/Makefile.am b/pm/sleep.d/Makefile.am
index 7693477..43f25f0 100644
--- a/pm/sleep.d/Makefile.am
+++ b/pm/sleep.d/Makefile.am
@@ -19,7 +19,7 @@ sleep_SCRIPTS = \
CLEANFILES = $(sleep_SCRIPTS)
-EXTRA_DIST= \
+sleep_sources = \
00clear.in \
01grub.in \
05led.in \
@@ -35,6 +35,8 @@ EXTRA_DIST= \
99video.in \
zzz.in
+EXTRA_DIST = $(sleep_sources)
+
do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_utils_libdir),g'
# If anything sources pm/functions, you MUST:
@@ -43,61 +45,9 @@ do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_utils_libdir),g'
# Doing this will ensure that the scripts will function
# no matter where they are installed.
-00clear: 00clear.in Makefile
- $(do_subst) <$(srcdir)/00clear.in > 00clear
- chmod +x 00clear
-
-01grub: 01grub.in Makefile
- $(do_subst) <$(srcdir)/01grub.in > 01grub
- chmod +x 01grub
-
-05led: 05led.in Makefile
- $(do_subst) <$(srcdir)/05led.in > 05led
- chmod +x 05led
-
-10NetworkManager: 10NetworkManager.in Makefile
- $(do_subst) <$(srcdir)/10NetworkManager.in > 10NetworkManager
- chmod +x 10NetworkManager
-
-20video: 20video.in Makefile
- $(do_subst) <$(srcdir)/20video.in > 20video
- chmod +x 20video
-
-49bluetooth: 49bluetooth.in Makefile
- $(do_subst) <$(srcdir)/49bluetooth.in > 49bluetooth
- chmod +x 49bluetooth
-
-50modules: 50modules.in Makefile
- $(do_subst) <$(srcdir)/50modules.in > 50modules
- chmod +x 50modules
-
-55battery: 55battery.in Makefile
- $(do_subst) <$(srcdir)/55battery.in > 55battery
- chmod +x 55battery
-
-65alsa: 65alsa.in Makefile
- $(do_subst) <$(srcdir)/65alsa.in > 65alsa
- chmod +x 65alsa
-
-90clock: 90clock.in Makefile
- $(do_subst) <$(srcdir)/90clock.in > 90clock
- chmod +x 90clock
-
-94cpufreq: 94cpufreq.in Makefile
- $(do_subst) <$(srcdir)/94cpufreq.in > 94cpufreq
- chmod +x 94cpufreq
-
-95led: 95led.in Makefile
- $(do_subst) <$(srcdir)/95led.in > 95led
- chmod +x 95led
-
-99video: 99video.in Makefile
- $(do_subst) <$(srcdir)/99video.in > 99video
- chmod +x 99video
-
-zzz: zzz.in Makefile
- $(do_subst) <$(srcdir)/zzz.in > zzz
- chmod +x zzz
+$(sleep_SCRIPTS): $(sleep_sources) Makefile
+ $(do_subst) <$(srcdir)/[EMAIL PROTECTED] > $@
+ chmod +x $@
install-data-hook:
-mkdir -p $(DESTDIR)$(sysconfdir)/pm/sleep.d
diff --git a/pm/sleep.d/zzz.in b/pm/sleep.d/zzz.in
old mode 100755
new mode 100644
diff --git a/src/Makefile.am b/src/Makefile.am
index 4da5b54..bfd1399 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,8 @@ acpower_SCRIPTS = \
CLEANFILES = $(extra_SCRIPTS) $(pm_utils_bin_SCRIPTS)
+transform_sources = pm-powersave.in pm-action.in
+
# If anything sources pm/functions, you MUST:
# 1: Have it source @PM-UTILS-LIBDIR@/functions
# 2: Add it to the list of files to be transformed below.
@@ -44,17 +46,12 @@ install-data-hook:
do_subst = sed -e 's,[EMAIL PROTECTED]@],$(pm_utils_libdir),g'
-pm-action: pm-action.in Makefile
- $(do_subst) < $(srcdir)/pm-action.in >pm-action
- chmod +x pm-action
-
-pm-powersave: pm-powersave.in Makefile
- $(do_subst) < $(srcdir)/pm-powersave.in >pm-powersave
- chmod +x pm-powersave
+pm-action pm-powersave: $(transform_sources) Makefile
+ $(do_subst) < $(srcdir)/[EMAIL PROTECTED] >$@
+ chmod +x $@
EXTRA_DIST = \
- pm-action.in \
- pm-powersave.in \
+ $(transform_sources) \
$(acpower_SCRIPTS) \
$(pm_utils_usr_bin_SCRIPTS)
diff --git a/src/pm-action.in b/src/pm-action.in
old mode 100755
new mode 100644
diff --git a/src/pm-powersave.in b/src/pm-powersave.in
old mode 100755
new mode 100644
_______________________________________________
Pm-utils mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/pm-utils
