Hello community,
here is the log from the commit of package laptop-mode-tools for
openSUSE:Factory checked in at 2016-02-22 08:57:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/laptop-mode-tools (Old)
and /work/SRC/openSUSE:Factory/.laptop-mode-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "laptop-mode-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/laptop-mode-tools/laptop-mode-tools.changes
2016-01-05 21:55:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.laptop-mode-tools.new/laptop-mode-tools.changes
2016-02-22 08:57:11.000000000 +0100
@@ -1,0 +2,31 @@
+Wed Feb 10 14:19:01 UTC 2016 - rob...@linux-source.org
+
+- Add laptop-mode.timer and lmt-poll.service to spec file
+- Fix spec file when checking suse_version macro
+- Update to version 1.68.1:
+ + Update details about runtime-pm in manpage
+ + Revert "Drop out reload"
+ + Log error more descriptively
+ + Write to common stderr. Do not hardcode a specific one
+ + Call lmt-udev in lmt-poll. Don't call the laptop_mode binary directly.
+ + Helps in a lot of housekeeping
+ + Direct stderr/stdout to journal
+ + Fix stdout descriptor
+ + Install the new .timer and poll service
+ + Use _sbindir for RPM
+- Changes from version 1.68:
+ + Fix all instances for BATTERY_LEVEL_POLLING
+ + Group kill the polling daemon so that its child process get the same signal
+ + Release the descriptor explicitly
+ + Add identifier about who's our parent
+ + Narrow down our power_supply subsystem event check condition
+ + Fine tune the .service file
+ + On my ultrabook, AC as reported as ACAD
+ + Enhance lmt-udev to better work with systemd
+ + Add a timer based polling for LMT. It is the equivalent of
battery-polling-daemon, using systemd
+ + Disable battery level polling by default, because most systems will have
systemd running
+ + Add documentation reference in systemd files
+ + Update release-checklist
+- Rebase laptop-mode-1.53-fix-pm-utils-sleep-script.diff
+
+-------------------------------------------------------------------
Old:
----
laptop-mode-tools_1.67.tar.gz
New:
----
laptop-mode-tools_1.68.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ laptop-mode-tools.spec ++++++
--- /var/tmp/diff_new_pack.qAVE9M/_old 2016-02-22 08:57:12.000000000 +0100
+++ /var/tmp/diff_new_pack.qAVE9M/_new 2016-02-22 08:57:12.000000000 +0100
@@ -20,7 +20,7 @@
%{!?_udevdir:%global _udevdir %{_libexecdir}/udev}
Name: laptop-mode-tools
-Version: 1.67
+Version: 1.68.1
Release: 0
Summary: The Laptop Mode Tools
License: GPL-2.0+
@@ -75,7 +75,7 @@
rm -r %{buildroot}%{_sysconfdir}/init.d
# Hack to remove sysvinit script link in usr/sbin
ln -s service %{buildroot}/%{_sbindir}/rclaptop-mode
-%if 0%{?suse_version} > 1315
+%if 0%{?suse_version} >= 1315
# remove pm-utils hook: as soon as DESTDIR is defined, the hook is always
installed
rm -rf %{buildroot}%{_libexecdir}/pm-utils
%endif
@@ -123,5 +123,9 @@
%doc README.SUSE
%{_tmpfilesdir}/laptop-mode.conf
%{_unitdir}/laptop-mode.service
+%if 0%{?suse_version} >= 1315
+%{_unitdir}/laptop-mode.timer
+%{_unitdir}/lmt-poll.service
+%endif
%changelog
++++++ laptop-mode-1.53-fix-pm-utils-sleep-script.diff ++++++
--- /var/tmp/diff_new_pack.qAVE9M/_old 2016-02-22 08:57:12.000000000 +0100
+++ /var/tmp/diff_new_pack.qAVE9M/_new 2016-02-22 08:57:12.000000000 +0100
@@ -1,14 +1,14 @@
-Index: b/etc/pm/sleep.d/01laptop-mode
-================================================================================
---- laptop-mode-tools_1.53/usr/lib/pm-utils/sleep.d/01laptop-mode
-+++ laptop-mode-tools_1.53/usr/lib/pm-utils/sleep.d/01laptop-mode
-@@ -13,7 +13,8 @@
- # Make laptop mode tools forcibly re-apply the hardware
settings
- # that laptop mode tools applies.
- if [ -e /usr/sbin/laptop_mode ] ; then
-- /usr/sbin/laptop_mode auto force
-+ # the "cat" is because laptop_mode seems to
truncate the output file :(
-+ /usr/sbin/laptop_mode auto force | cat
- fi
- ;;
- *) exit $NA
+Index: laptop-mode-tools_1.68.1/usr/lib/pm-utils/sleep.d/01laptop-mode
+===================================================================
+--- laptop-mode-tools_1.68.1.orig/usr/lib/pm-utils/sleep.d/01laptop-mode
++++ laptop-mode-tools_1.68.1/usr/lib/pm-utils/sleep.d/01laptop-mode
+@@ -13,7 +13,8 @@ else
+ # Make laptop mode tools forcibly re-apply the hardware
settings
+ # that laptop mode tools applies.
+ if [ -e /usr/sbin/laptop_mode ] ; then
+- /usr/sbin/laptop_mode auto force
++ # the "cat" is because laptop_mode seems to
truncate the output file :(
++ /usr/sbin/laptop_mode auto force | cat
+ fi
+ ;;
+ *) exit $NA
++++++ laptop-mode-tools_1.67.tar.gz -> laptop-mode-tools_1.68.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/Documentation/revision-history.txt
new/laptop-mode-tools_1.68.1/Documentation/revision-history.txt
--- old/laptop-mode-tools_1.67/Documentation/revision-history.txt
2015-07-02 13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/Documentation/revision-history.txt
2015-09-27 10:33:07.000000000 +0200
@@ -1,3 +1,30 @@
+1.68.1 - Sun Sep 27 14:00:13 IST 2015
+ * Update details about runtime-pm in manpage
+ * Revert "Drop out reload"
+ * Log error more descriptively
+ * Write to common stderr. Do not hardcode a specific one
+ * Call lmt-udev in lmt-poll. Don't call the laptop_mode binary directly.
+ Helps in a lot of housekeeping
+ * Direct stderr/stdout to journal
+ * Fix stdout descriptor
+ * Install the new .timer and poll service
+ * Use _sbindir for RPM
+
+1.68 - Thu Aug 27 22:36:43 IST 2015
+ * Fix all instances for BATTERY_LEVEL_POLLING
+ * Group kill the polling daemon so that its child process get the same
signal
+ * Release the descriptor explicitly
+ * Add identifier about who's our parent
+ * Narrow down our power_supply subsystem event check condition
+ * Fine tune the .service file
+ * On my ultrabook, AC as reported as ACAD
+ * Enhance lmt-udev to better work with systemd
+ * Add a timer based polling for LMT. It is the equivalent of
battery-polling-daemon,
+ using systemd
+ * Disable battery level polling by default, because most systems will have
systemd running
+ * Add documentation reference in systemd files
+ * Update release-checklist
+
1.67 - Thu Jul 2 17:05:07 IST 2015
* Relax minimum window size to accomodate low res screens
* Fix variable name to comply with our "constants" assuptions
@@ -866,12 +893,12 @@
(and an initial implementation). You can put links to init scripts (or
any other scripts that take "start" and "stop" commands) in the
following directories:
- o /etc/laptop-mode/nolm-ac-start
- o /etc/laptop-mode/nolm-ac-stop
- o /etc/laptop-mode/lm-ac-start
- o /etc/laptop-mode/lm-ac-stop
- o /etc/laptop-mode/batt-start
- o /etc/laptop-mode/batt-stop
+ o /etc/laptop-mode/nolm-ac-start
+ o /etc/laptop-mode/nolm-ac-stop
+ o /etc/laptop-mode/lm-ac-start
+ o /etc/laptop-mode/lm-ac-stop
+ o /etc/laptop-mode/batt-start
+ o /etc/laptop-mode/batt-stop
* Added the ability to adjust X-windows DPMS timing, using
CONTROL_DPMS_STANDBY. Thanks to Jan Polacek.
* Fixes to useless output of hdparm when laptop mode tries to determine
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/etc/acpi/actions/lm_ac_adapter.sh
new/laptop-mode-tools_1.68.1/etc/acpi/actions/lm_ac_adapter.sh
--- old/laptop-mode-tools_1.67/etc/acpi/actions/lm_ac_adapter.sh
2015-07-02 13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/acpi/actions/lm_ac_adapter.sh
2015-09-27 10:33:07.000000000 +0200
@@ -1,7 +1,6 @@
#! /bin/sh
-test -f /usr/sbin/laptop_mode || exit 0
+test -f /lib/udev/lmt-udev || exit 0
# ac on/offline event handler
-
-/usr/sbin/laptop_mode auto
+/lib/udev/lmt-udev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/etc/acpi/actions/lm_battery.sh
new/laptop-mode-tools_1.68.1/etc/acpi/actions/lm_battery.sh
--- old/laptop-mode-tools_1.67/etc/acpi/actions/lm_battery.sh 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/acpi/actions/lm_battery.sh 2015-09-27
10:33:07.000000000 +0200
@@ -1,8 +1,7 @@
#! /bin/sh
-test -f /usr/sbin/laptop_mode || exit 0
+test -f /lib/udev/lmt-udev || exit 0
# Automatically disable laptop mode when the battery almost runs out,
# and re-enable it when it
-
-/usr/sbin/laptop_mode auto
+/lib/udev/lmt-udev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/etc/acpi/actions/lm_lid.sh
new/laptop-mode-tools_1.68.1/etc/acpi/actions/lm_lid.sh
--- old/laptop-mode-tools_1.67/etc/acpi/actions/lm_lid.sh 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/acpi/actions/lm_lid.sh 2015-09-27
10:33:07.000000000 +0200
@@ -1,7 +1,6 @@
#! /bin/sh
-test -f /usr/sbin/laptop_mode || exit 0
+test -f /lib/udev/lmt-udev || exit 0
# lid button pressed/released event handler
-
-/usr/sbin/laptop_mode auto
+/lib/udev/lmt-udev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/etc/apm/event.d/laptop-mode
new/laptop-mode-tools_1.68.1/etc/apm/event.d/laptop-mode
--- old/laptop-mode-tools_1.67/etc/apm/event.d/laptop-mode 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/apm/event.d/laptop-mode 2015-09-27
10:33:07.000000000 +0200
@@ -22,7 +22,7 @@
set -e
-LMODE=/usr/sbin/laptop_mode
+LMODE=/lib/udev/lmt-udev
[ -x "${LMODE}" ] || exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/etc/laptop-mode/conf.d/battery-level-polling.conf
new/laptop-mode-tools_1.68.1/etc/laptop-mode/conf.d/battery-level-polling.conf
---
old/laptop-mode-tools_1.67/etc/laptop-mode/conf.d/battery-level-polling.conf
2015-07-02 13:41:09.000000000 +0200
+++
new/laptop-mode-tools_1.68.1/etc/laptop-mode/conf.d/battery-level-polling.conf
2015-09-27 10:33:07.000000000 +0200
@@ -21,7 +21,7 @@
#
# Enable this setting to enable battery level polling.
#
-CONTROL_BATTERY_LEVEL_POLLING=1
+CONTROL_BATTERY_LEVEL_POLLING=0
# Blacklist this module's exectuion in flock
# This is a workaround to ensure that batter-polling-daemon does not acquire
the lock
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/etc/power/event.d/laptop-mode
new/laptop-mode-tools_1.68.1/etc/power/event.d/laptop-mode
--- old/laptop-mode-tools_1.67/etc/power/event.d/laptop-mode 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/power/event.d/laptop-mode 2015-09-27
10:33:07.000000000 +0200
@@ -11,7 +11,7 @@
# --- end of public part -- don't change below this line ---
set -e
-LMODE=/usr/sbin/laptop_mode
+LMODE=/lib/udev/lmt-udev
[ -x $LMODE ] || exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/etc/power/scripts.d/laptop-mode
new/laptop-mode-tools_1.68.1/etc/power/scripts.d/laptop-mode
--- old/laptop-mode-tools_1.67/etc/power/scripts.d/laptop-mode 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/power/scripts.d/laptop-mode
2015-09-27 10:33:07.000000000 +0200
@@ -11,7 +11,7 @@
# --- end of public part -- don't change below this line ---
set -e
-LMODE=/usr/sbin/laptop_mode
+LMODE=/lib/udev/lmt-udev
[ -x $LMODE ] || exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/etc/rules/99-laptop-mode.rules
new/laptop-mode-tools_1.68.1/etc/rules/99-laptop-mode.rules
--- old/laptop-mode-tools_1.67/etc/rules/99-laptop-mode.rules 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/rules/99-laptop-mode.rules 2015-09-27
10:33:07.000000000 +0200
@@ -1,3 +1,3 @@
-ACTION=="change", SUBSYSTEM=="power_supply", RUN+="lmt-udev auto"
+ACTION=="change", SUBSYSTEM=="power_supply",
ENV{POWER_SUPPLY_NAME}=="|AC|ACAD", RUN+="lmt-udev auto"
ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="lmt-udev auto force"
ACTION=="add|remove", SUBSYSTEM=="usb", RUN+="lmt-udev force
modules=runtime-pm devices=%k"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/etc/rules/lmt-udev
new/laptop-mode-tools_1.68.1/etc/rules/lmt-udev
--- old/laptop-mode-tools_1.67/etc/rules/lmt-udev 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/rules/lmt-udev 2015-09-27
10:33:07.000000000 +0200
@@ -1,7 +1,8 @@
#!/bin/sh -e
-# /usr is not guaranteed to be mounted when udev starts
-(
+
+# /usr is not guaranteed to be mounted when udev starts
+non_systemd_way() {
if [ -e /lib/udev/hotplug.functions ]; then
. /lib/udev/hotplug.functions
wait_for_file /usr/sbin/laptop_mode
@@ -21,5 +22,30 @@
mesg "$file did not appear before the timeout!"
exit 1
fi
+}
+
+
+
+# Under systemd, we don't do synchronous operations, so we can run in the
foreground;
+# And we need also need to run in foreground, because forked children get kill
immediately
+# under systemd/udev
+
+if [ -d /run/systemd/system ]; then
+ exec systemctl --no-block reload-or-restart laptop-mode
+else
+ # Under sysvinit/upstart, we need to fork as we start the long-running
+ # /usr/sbin/laptop_mode process.
+ #
+ # Also, if this happens during boot, we may want to wait until /usr is
available
+ # This else stanza is going to be used rarely, because going forward we
are
+ # going to use systemd.
+ # But for compatibility reasons, we'll carry this
+ #
+ # That said, we background the execution here, because, otherwise udevd
will wait
+ # for this process which will block
+
+ exec > /dev/null 2>dev/null
+ non_systemd_way "$@" &
+fi
-) </dev/null >/dev/null 2>&1 &
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/etc/systemd/laptop-mode.service
new/laptop-mode-tools_1.68.1/etc/systemd/laptop-mode.service
--- old/laptop-mode-tools_1.67/etc/systemd/laptop-mode.service 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/etc/systemd/laptop-mode.service
2015-09-27 10:33:07.000000000 +0200
@@ -1,14 +1,17 @@
[Unit]
Description=Laptop Mode Tools
+Documentation=man:laptop_mode(8) man:laptop-mode.conf(8)
+Documentation=http://samwel.tk/laptop_mode
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/sbin/laptop_mode init auto
-ExecStop=/usr/sbin/laptop_mode init stop
-ExecStopPost=/bin/rm -f /var/run/laptop-mode-tools/enabled
-StandardOutput=tty
-StandardError=tty
+ExecStart=@/usr/sbin/laptop_mode init auto
+ExecStop=@/usr/sbin/laptop_mode init stop
+ExecStopPost=@/bin/rm -f /var/run/laptop-mode-tools/enabled
+ExecReload=@/usr/sbin/laptop_mode auto
+StandardOutput=journal
+StandardError=journal
[Install]
WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/etc/systemd/laptop-mode.timer
new/laptop-mode-tools_1.68.1/etc/systemd/laptop-mode.timer
--- old/laptop-mode-tools_1.67/etc/systemd/laptop-mode.timer 1970-01-01
01:00:00.000000000 +0100
+++ new/laptop-mode-tools_1.68.1/etc/systemd/laptop-mode.timer 2015-09-27
10:33:07.000000000 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=Runs Laptop Mode Tools - Polling Service, every 150 seconds
+
+
+[Timer]
+# Let's run every 150 secs, to poll the battery
+OnUnitActiveSec=150s
+OnActiveSec=150s
+Unit=lmt-poll.service
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/etc/systemd/lmt-poll.service
new/laptop-mode-tools_1.68.1/etc/systemd/lmt-poll.service
--- old/laptop-mode-tools_1.67/etc/systemd/lmt-poll.service 1970-01-01
01:00:00.000000000 +0100
+++ new/laptop-mode-tools_1.68.1/etc/systemd/lmt-poll.service 2015-09-27
10:33:07.000000000 +0200
@@ -0,0 +1,15 @@
+[Unit]
+Description=Laptop Mode Tools - Battery Polling Service
+Documentation=man:laptop_mode(8) man:laptop-mode.conf(8)
+Documentation=http://samwel.tk/laptop_mode
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=/lib/udev/lmt-udev
+ExecReload=/lib/udev/lmt-udev
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/install.sh
new/laptop-mode-tools_1.68.1/install.sh
--- old/laptop-mode-tools_1.67/install.sh 2015-07-02 13:41:09.000000000
+0200
+++ new/laptop-mode-tools_1.68.1/install.sh 2015-09-27 10:33:07.000000000
+0200
@@ -220,6 +220,16 @@
echo "$0: Failed to install systemd service into
$SYSTEMD_UNIT_D Installation failed."
fi
+ # timer file
+ if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.timer
"$DESTDIR/$SYSTEMD_UNIT_D/laptop-mode.timer" ) ; then
+ echo "$0: Failed to install systemd timer into $SYSTEMD_UNIT_D
Installation failed."
+ fi
+
+ # and timer's calling service file
+ if ( ! $INSTALL -D -m 644 etc/systemd/lmt-poll.service
"$DESTDIR/$SYSTEMD_UNIT_D/lmt-poll.service" ) ; then
+ echo "$0: Failed to install systemd poll service into
$SYSTEMD_UNIT_D Installation failed."
+ fi
+
# and systemd's tmpfiles.d
if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.conf.tmpfiles
"$DESTDIR/${TMPFILES_D}/laptop-mode.conf" ) ; then
echo "$0: Failed to install systemd tmpfiles into ${TMPFILES_D}
Installation failed."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/laptop-mode-tools.spec
new/laptop-mode-tools_1.68.1/laptop-mode-tools.spec
--- old/laptop-mode-tools_1.67/laptop-mode-tools.spec 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/laptop-mode-tools.spec 2015-09-27
10:33:07.000000000 +0200
@@ -3,7 +3,7 @@
Summary: Tools for power savings based on battery/AC status
Name: laptop-mode-tools
-Version: 1.67
+Version: 1.68.1
Release: 1
License: GPL
Group: System Environment/Base
@@ -74,12 +74,15 @@
%config %{_initrddir}/laptop-mode
/lib/udev/lmt-udev
/lib/systemd/system/laptop-mode.service
+/lib/systemd/system/laptop-mode.timer
+/lib/systemd/system/lmt-poll.service
/lib/udev/rules.d/99-laptop-mode.rules
%{_sysconfdir}/apm/event.d/*
%{_sysconfdir}/power/scripts.d/*
%{_sysconfdir}/power/event.d/*
-%{_usr}/sbin/*
+#%{_usr}/sbin/*
+%{_sbindir}/*
%{_usr}/share/laptop-mode-tools/modules/*
%{_usr}/share/laptop-mode-tools/module-helpers/*
%{_usr}/lib/pm-utils/sleep.d/*
@@ -99,6 +102,12 @@
%changelog
+* Sun Sep 27 2015 Ritesh Raj Sarraf <r...@researchut.com> - 1.68.1-1
+- Updated to release 1.68.1
+
+* Thu Aug 27 2015 Ritesh Raj Sarraf <r...@researchut.com> - 1.68-1
+- Updated to release 1.68.
+
* Thu Jul 2 2015 Ritesh Raj Sarraf <r...@researchut.com> - 1.67-1
- Updated to release 1.67.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/man/laptop-mode.conf.8
new/laptop-mode-tools_1.68.1/man/laptop-mode.conf.8
--- old/laptop-mode-tools_1.67/man/laptop-mode.conf.8 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/man/laptop-mode.conf.8 2015-09-27
10:33:07.000000000 +0200
@@ -477,7 +477,7 @@
features of laptop mode tools even when your battery does not send out frequent
ACPI to indicate a change in level.
-.IP "\fBENABLE_BATTERY_LEVEL_POLLING\fP" 10
+.IP "\fBCONTROL_BATTERY_LEVEL_POLLING\fP" 10
When this option is enabled, laptop mode tools will automatically poll the
battery level every once in a while to see if the levels have changed, and to
see if actions should be taken as a consequence.
@@ -566,15 +566,45 @@
auto modules setting will activate this module automatically. PCIe ASPM may
require that the pcie_aspm=force kernel option is enabled.
+.SS "\fI/etc/laptop-mode/conf.d/usb-autosuspend.conf\fP"
+
+This option has been superseded by the new runtime-pm.conf settings
+
.SS "\fI/etc/laptop-mode/conf.d/runtime-pm.conf\fP"
The runtime-pm module allows you to enable the Runtime Power Management
framework for the Linux kernel.
-.IP "\fBCONTROL_RUNTIME_PM\fP" 10
+
+.IP "\fBCONTROL_RUNTIME_AUTOSUSPEND\fP" 10
If this option is enabled, laptop mode tools will automatically enable the
-Kernel's Runtime Power Management settings. The power saving settings are
always
-enabled, not only on battery power.
+USB autosuspend feature for all devices. The USB autosuspend feature will
always
+be enabled, not only on battery power.
+.IP "\fBAUTOSUSPEND_RUNTIME_DEVID_BLACKLIST\fP" 10
+Here, you can specify the list of USB IDs that should not use autosuspend.
+Use lsusb to find out the IDs of your USB devices.
+Example: AUTOSUSPEND_RUNTIME_DEVID_BLACKLIST="046d:c025 0123:abcd"
+
+.IP "\fBAUTOSUSPEND_RUNTIME_DEVTYPE_BLACKLIST\fP" 10
+Here, you can specify the list of device driver that should not use
autosuspend.
+The driver type is given by "DRIVER=..." in a device's uevent file
+Example: AUTOSUSPEND_RUNTIME_DEVTYPE_BLACKLIST="usbhid usb-storage usbmouse"
+
+.IP "\fBAUTOSUSPEND_USE_WHITELIST\fP" 10
+Set this to use opt-in/whitelist instead of opt-out/blacklist for deciding
+which devices should be autosuspended.
+AUTOSUSPEND_USE_WHITELIST=0 means AUTOSUSPEND_*_BLACKLIST will be used.
+AUTOSUSPEND_USE_WHITELIST=1 means AUTOSUSPEND_*_WHITELIST will be used.
+
+.IP "\fBAUTOSUSPEND_RUNTIME_DEVID_WHITELIST\fP" 10
+The list of Device IDs that should use autosuspend. Use system commands or
+look into sysfs to find out the IDs of your devices.
+Example: AUTOSUSPEND_DEVID_WHITELIST="046d:c025 0123:abcd"
+
+.IP "\fBAUTOSUSPEND_RUNTIME_DEVTYPE_WHITELIST\fP" 10
+The list of device driver types that should use autosuspend. The driver
+type is given by "DRIVER=..." in a device's uevent file.
+Example: AUTOSUSPEND_DEVTYPE_WHITELIST="usbhid usb-storage usbmouse"
.SS "\fI/etc/laptop-mode/conf.d/intel-hda-powersave.conf\fP"
@@ -744,21 +774,6 @@
Here you can specify your custom command that will need to be executed. The
numbers can grow upto 9. The command needs to be specified in double quotes
-.SS "\fI/etc/laptop-mode/conf.d/usb-autosuspend.conf\fP"
-
-The usb-autosuspend module allows you to automatically enable the Linux
-kernel's USB autosuspend feature for all USB devices.
-
-.IP "\fBCONTROL_USB_AUTOSUSPEND\fP" 10
-If this option is enabled, laptop mode tools will automatically enable the
-USB autosuspend feature for all devices. The USB autosuspend feature will
always
-be enabled, not only on battery power.
-
-.IP "\fBAUTOSUSPEND_USBID_BLACKLIST\fP" 10
-Here, you can specify the list of USB IDs that should not use autosuspend.
-Use lsusb to find out the IDs of your USB devices.
-Example: AUTOSUSPEND_USBID_BLACKLIST="046d:c025 0123:abcd"
-
.SS "\fI/etc/laptop-mode/conf.d/eee-superhe.conf\fP"
The eee-superhe module allows you to control the CPU frequency scalling on the
EEE PC. It requires the eeepc_laptop kernel module to be loaded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/release-checklist
new/laptop-mode-tools_1.68.1/release-checklist
--- old/laptop-mode-tools_1.67/release-checklist 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/release-checklist 2015-09-27
10:33:07.000000000 +0200
@@ -1,8 +1,9 @@
* Update version in usr/sbin/laptop_mode
-* Put release date in Documentation/revision-history
+* Put release date in Documentation/revision-history. Eg: git log 1.67...HEAD
--pretty=format:'%s' --reverse,
+ or use alias 'mychlog' from the .gitconfig
* Update laptop-mode-tools.spec
+* Tag the release
* Create git tarball using 'git archive --format=tar
--prefix=laptop-mode-tools_N.NN/ GIT_VERSION_TAG | gzip >
laptop-mode-tools_N.NN.tar.gz
* Update Bart's site
-* Update freshmeat
* Update Launchpad's Release page
* Send Release Announcement
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/laptop-mode-tools_1.67/usr/sbin/laptop_mode
new/laptop-mode-tools_1.68.1/usr/sbin/laptop_mode
--- old/laptop-mode-tools_1.67/usr/sbin/laptop_mode 2015-07-02
13:41:09.000000000 +0200
+++ new/laptop-mode-tools_1.68.1/usr/sbin/laptop_mode 2015-09-27
10:33:07.000000000 +0200
@@ -35,7 +35,7 @@
# The laptop mode tools version number. Extracted by the installer makefile
# as well, so don't change the format!
-LMTVERSION=1.67
+LMTVERSION=1.68.1
# This script is loaded from multiple scripts to set the config defaults
# and to read the configuration on top of those. Only when the command is
@@ -190,12 +190,12 @@
fi
if [ "$1" = "VERBOSE" ]; then
- $LM_VERBOSE && echo "$2" >>/dev/fd/2;
+ $LM_VERBOSE && echo "$2" >&2;
elif [ "$1" = "ERR" ]; then
- echo "$2" >>/dev/fd/2;
+ echo "$2" >&2;
else
# Message of type MSG and STATUS can go to stdout.
- echo "$2" >>/dev/fd/1;
+ echo "$2" >&1;
fi
}
@@ -446,6 +446,7 @@
fi
+ log "VERBOSE" "Laptop Mode Tools invoked by parent: $PPID"
# Determine the power state.
@@ -1131,13 +1132,14 @@
# plagued by the lock. We need the polling daemon to be independent of the REQ
and INVOC locks.
# Polling daemon should *only* have inherited a lock on LMT_BATTPOLL_LOCK. Any
other inheritance
# for it is a BUG.
-if [ x$ENABLE_BATTERY_LEVEL_POLLING = x1 ] && [ x$BLACKLIST_IN_FLOCK = x1 ];
then
+if [ x$CONTROL_BATTERY_LEVEL_POLLING = x1 ] && [ x$BLACKLIST_IN_FLOCK = x1 ];
then
log "VERBOSE" "Battery level polling is enabled."
if [ x$ON_AC = x1 ] ; then
log "VERBOSE" "On AC, stopping the polling daemon."
# In AC mode we disable the polling daemon.
- killall -q lm-polling-daemon
+ killall -gq lm-polling-daemon
+ $FLOCK -u 7;
elif [ x$ON_AC = x0 ]; then
exec 7>$LMT_BATTPOLL_LOCK;
if $FLOCK -n -x -w 1 7; then
@@ -1156,7 +1158,8 @@
# should be killed.
if [ x$INITSCRIPT_STOP = x1 ]; then
log "VERBOSE" "On Battery, but init script stop is
called. Killing lm-polling-daemon"
- killall -q lm-polling-daemon
+ killall -gq lm-polling-daemon
+ $FLOCK -u 7;
fi
else
log "ERR" "Unknown ON_AC state: $ON_AC";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/usr/share/laptop-mode-tools/modules/battery-level-polling
new/laptop-mode-tools_1.68.1/usr/share/laptop-mode-tools/modules/battery-level-polling
---
old/laptop-mode-tools_1.67/usr/share/laptop-mode-tools/modules/battery-level-polling
2015-07-02 13:41:09.000000000 +0200
+++
new/laptop-mode-tools_1.68.1/usr/share/laptop-mode-tools/modules/battery-level-polling
2015-09-27 10:33:07.000000000 +0200
@@ -3,7 +3,7 @@
# Laptop mode tools module: Battery level polling.
#
-if [ x$ENABLE_BATTERY_LEVEL_POLLING = x1 ] ; then
+if [ x$CONTROL_BATTERY_LEVEL_POLLING = x1 ] ; then
log "VERBOSE" "Battery level polling is enabled."
if [ x$BLACKLIST_IN_FLOCK = x1 ]; then
@@ -13,7 +13,8 @@
log "VERBOSE" "On AC, stopping the polling daemon."
# In AC mode we disable the polling daemon.
- killall -q lm-polling-daemon
+ killall -gq lm-polling-daemon
+ $FLOCK -u 7;
else
if ! pidof -x lm-polling-daemon ; then
log "VERBOSE" "On battery and there was no
polling daemon yet, starting the polling daemon."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/laptop-mode-tools_1.67/usr/share/laptop-mode-tools/modules/wireless-power
new/laptop-mode-tools_1.68.1/usr/share/laptop-mode-tools/modules/wireless-power
---
old/laptop-mode-tools_1.67/usr/share/laptop-mode-tools/modules/wireless-power
2015-07-02 13:41:09.000000000 +0200
+++
new/laptop-mode-tools_1.68.1/usr/share/laptop-mode-tools/modules/wireless-power
2015-09-27 10:33:07.000000000 +0200
@@ -77,12 +77,12 @@
if [ $ON_AC -eq 1 ] ; then
log "VERBOSE" "On AC power: setting power saving mode
for $IF to $WIRELESS_AC_POWER_SAVING_ONOFF."
if ( ! $IWCONFIG $IF power
$WIRELESS_AC_POWER_SAVING_ONOFF ) ; then
- log "ERR" "Failed."
+ log "ERR" "Failed to re-set power saving mode
for wireless card"
fi
else
log "VERBOSE" "On battery: setting power saving mode
for $IF to $WIRELESS_BATT_POWER_SAVING_ONOFF."
if ( ! $IWCONFIG $IF power
$WIRELESS_BATT_POWER_SAVING_ONOFF ) ; then
- log "ERR" "Failed."
+ log "ERR" "Failed to set power saving mode for
wireless card"
fi
fi
done
