I have made the following changes intended for : CE:Utils / pm-utils Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/3680 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3680: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-12-19T12:04:26 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:Utils / pm-utils -> CE:Utils / pm-utils changes files: -------------- ++++++ new changes file: --- pm-utils.changes +++ pm-utils.changes @@ -0,0 +1,51 @@ +* Mon Dec 19 2011 Marko Saukko <[email protected]> - 1.4.1 +- Removed usermode dep as there is no calls to those binaries in pm-utils +- Removed pciutils >= 2.2.1 dep as no calls to lspci, setpci or update-pciids is done. +- Dropped not included files: pm-utils-99hd-apm-restore, pm-utils-hd-apm-restore.conf + +* Mon Jun 06 2011 Anas Nashif <[email protected]> - 1.4.1 +- Update to 1.4.1 + +* Thu Mar 03 2011 Neo Fang <[email protected]> - 1.3.1 +- Fix BMC#13941: Add 10-umount-SD script to umount sd card before suspend. + +* Mon Oct 18 2010 Yan Yin <[email protected]> - 1.3.1 +- Fix BMC#3932: Rename fix-bmc-#3932.patch to dell-1012-s3-resume-failure-workaround.patch + +* Wed Oct 13 2010 Yan Yin <[email protected]> - 1.3.1 +- Fix BMC#3932: Failed to resume from S3 sometimes on dellmini1012 + +* Tue Jul 13 2010 Yan Yin <[email protected]> - 1.3.1 +- Update to latest 1.3.1. + +* Thu Jun 24 2010 Yan Li <[email protected]> 1.3.0 +- Remove the dependency of kbd + +* Thu Mar 24 2010 Yu <[email protected]> 1.3.0 +- Update to latest 1.3.0. + +* Tue Mar 23 2010 Arjan van de Ven <[email protected]> 1.3.0_rc3 +- don't ship the sched powersave script; we don't want to have that one. + +* Sun Sep 06 2009 Peter Zhu <[email protected]> 1.3.0_rc3 +- Update to latest 1.3.0_rc3 +- Maintain video quirks rather than dependend on hal-info + +* Sun Sep 06 2009 Peter Zhu <[email protected]> 1.2.5 +- Update to latest 1.2.5 + +* Wed May 06 2009 Arjan van de Ven <[email protected]> 1.2.3 +- make sure to not touch the APM settings of the disk; the BIOS should do this. + +* Wed 18 Feb 2009 Passion Zhao <[email protected]> +- Modify the /etc/security/console.apps/pm-[suspend/powersave/hibernate] to fix the bug #796 + +* Wed Dec 10 2008 Arjan van de Ven <[email protected]> 1.2.3 +- Upgrade to version 1.2.3 + +* Fri Sep 05 2008 Peng Li <[email protected]> 1.1.0 +- remove dependency on vbetool + +* Wed Aug 13 2008 Zhang Xin <[email protected]> +- updating branding info + new: ---- dell-1012-s3-resume-failure-workaround.patch pm-hibernate.app pm-hibernate.pam pm-powersave.app pm-powersave.pam pm-quirks-20100316.tar.gz pm-suspend-hybrid.app pm-suspend-hybrid.pam pm-suspend.app pm-suspend.pam pm-utils-1.4.1.tar.gz pm-utils-10umount-SD.patch pm-utils-bugreport-info.sh pm-utils.changes pm-utils.spec spec files: ----------- ++++++ new spec file: --- pm-utils.spec +++ pm-utils.spec @@ -0,0 +1,153 @@ +#specfile originally created for Fedora, modified for Moblin Linux +Name: pm-utils +Summary: Power management utilities and scripts for Moblin +License: GPLv2 +Version: 1.4.1 +Release: 1 +Group: System/Base +URL: http://pm-utils.freedesktop.org +# Disabled: usermode +# Removed as no calls to lspci, setpci or update-pciids is done. +# Requires: pciutils >= 2.2.1 +# for on_ac_power +Source0: http://pm-utils.freedesktop.org/releases/pm-utils-%{version}.tar.gz +Source1: pm-suspend.pam +Source2: pm-hibernate.pam +Source3: pm-powersave.pam +Source4: pm-suspend-hybrid.pam +Source5: pm-quirks-20100316.tar.gz + + +Source11: pm-suspend.app +Source12: pm-hibernate.app +Source13: pm-powersave.app +Source14: pm-suspend-hybrid.app + +Source23: pm-utils-bugreport-info.sh +Patch0 : dell-1012-s3-resume-failure-workaround.patch +Patch1 : pm-utils-10umount-SD.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + +%description +The pm-utils package contains utilities and scripts useful for tasks related +to power management. + +%package devel +Summary: Files for development using %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains the pkg-config files for development +when building programs that use %{name}. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + + +%build +%configure +make %{?_smp_mflags} + +%install + +%make_install + +install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d +for pamsource in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do + filename=$(basename ${pamsource} .pam) + install -T -p -m 0644 ${pamsource} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/${filename} +done + +install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/ +for source in %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} ; do + filename=$(basename ${source} .app) + install -T -p -m 0644 ${source} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/${filename} +done + +install -m 0755 -d $RPM_BUILD_ROOT/%{_bindir} +pushd $RPM_BUILD_ROOT/%{_bindir} +for binary in pm-hibernate pm-powersave pm-suspend pm-suspend-hybrid; do + ln -sf consolehelper ${binary} +done +popd + +install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/pm-utils/{locks,storage} + +install -D -m 0755 %{SOURCE23} $RPM_BUILD_ROOT%{_bindir}/pm-utils-bugreport-info.sh + +install -D -m 0644 %{SOURCE5} $RPM_BUILD_ROOT/%{_libdir}/pm-utils/video-quirks.tar.gz +pushd $RPM_BUILD_ROOT/%{_libdir}/pm-utils/ +tar xzfv video-quirks.tar.gz +popd +rm -f $RPM_BUILD_ROOT/%{_libdir}/pm-utils/video-quirks.tar.gz + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + + +%pre +if [ -f %{_sysconfdir}/sysconfig/pm ]; then + mkdir -p %{_sysconfdir}/pm/config.d + mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig.conf +fi + + +%post +if [ -f %{_sysconfdir}/pm/config.rpmsave ]; then + mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig.conf +fi +touch -a %{_localstatedir}/log/pm-suspend.log +if [ -f %{_localstatedir}/log/pm-suspend.log ] ; then + chmod 0600 %{_localstatedir}/log/pm-suspend.log + [ -x /sbin/restorecon ] && restorecon %{_localstatedir}/log/pm-suspend.log > /dev/null 2>&1 ||: +fi + + +%files +%defattr(-,root,root,-) +%doc COPYING +%doc %{_docdir}/pm-utils +%{_sysconfdir}/pm/ +%{_sysconfdir}/security/console.apps/pm-hibernate +%{_sysconfdir}/security/console.apps/pm-powersave +%{_sysconfdir}/security/console.apps/pm-suspend +%{_sysconfdir}/security/console.apps/pm-suspend-hybrid +%{_sysconfdir}/pam.d/pm-hibernate +%{_sysconfdir}/pam.d/pm-powersave +%{_sysconfdir}/pam.d/pm-suspend +%{_sysconfdir}/pam.d/pm-suspend-hybrid +%dir %{_libdir}/pm-utils/ +%{_libdir}/pm-utils/bin/ +%{_libdir}/pm-utils/defaults +%{_libdir}/pm-utils/functions +%{_libdir}/pm-utils/pm-functions +%{_libdir}/pm-utils/power.d/ +%{_libdir}/pm-utils/sleep.d/ +%{_libdir}/pm-utils/module.d +%{_libdir}/pm-utils/20-video-quirk-pm* +%{_bindir}/on_ac_power +%{_bindir}/pm-hibernate +%{_bindir}/pm-is-supported +%{_bindir}/pm-powersave +%{_bindir}/pm-suspend +%{_bindir}/pm-suspend-hybrid +%{_bindir}/pm-utils-bugreport-info.sh +%{_sbindir}/pm-hibernate +%{_sbindir}/pm-powersave +%{_sbindir}/pm-suspend +%{_sbindir}/pm-suspend-hybrid +%{_localstatedir}/run/pm-utils/ +%exclude /usr/lib/pm-utils/power.d/sched-powersave + +%ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log + +%files devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/pm-utils.pc + other changes: -------------- ++++++ dell-1012-s3-resume-failure-workaround.patch (new) --- dell-1012-s3-resume-failure-workaround.patch +++ dell-1012-s3-resume-failure-workaround.patch @@ -0,0 +1,20 @@ +diff -urpN pm-utils-1.3.1/pm/sleep.d/88sleep2 pm-utils-1.3.1.patched/pm/sleep.d/88sleep2 +--- pm-utils-1.3.1/pm/sleep.d/88sleep2 1970-01-01 08:00:00.000000000 +0800 ++++ pm-utils-1.3.1.patched/pm/sleep.d/88sleep2 2010-10-13 17:09:09.189014860 +0800 +@@ -0,0 +1,5 @@ ++#!/bin/sh ++# Synchronize system time with hardware time. ++# Modern kernels handle this correctly so we skip this hook by default. ++ ++sleep 2 +diff -urpN pm-utils-1.3.1/pm/sleep.d/Makefile.am pm-utils-1.3.1.patched/pm/sleep.d/Makefile.am +--- pm-utils-1.3.1/pm/sleep.d/Makefile.am 2010-07-04 22:42:51.000000000 +0800 ++++ pm-utils-1.3.1.patched/pm/sleep.d/Makefile.am 2010-10-13 22:09:26.365014671 +0800 +@@ -7,6 +7,7 @@ sleep_SCRIPTS = \ + 49bluetooth \ + 55NetworkManager \ + 75modules \ ++ 88sleep2 \ + 90clock \ + 94cpufreq \ + 95led \ ++++++ pm-hibernate.app (new) --- pm-hibernate.app +++ pm-hibernate.app @@ -0,0 +1 @@ +FALLBACK=true ++++++ pm-hibernate.pam (new) --- pm-hibernate.pam +++ pm-hibernate.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_console.so +#auth required pam_stack.so service=system-auth +account required pam_permit.so ++++++ pm-powersave.app (new) --- pm-powersave.app +++ pm-powersave.app @@ -0,0 +1 @@ +FALLBACK=true ++++++ pm-powersave.pam (new) --- pm-powersave.pam +++ pm-powersave.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_console.so +#auth required pam_stack.so service=system-auth +account required pam_permit.so ++++++ pm-quirks-20100316.tar.gz (new) ++++++ pm-suspend-hybrid.app (new) --- pm-suspend-hybrid.app +++ pm-suspend-hybrid.app @@ -0,0 +1 @@ +FALLBACK=true ++++++ pm-suspend-hybrid.pam (new) --- pm-suspend-hybrid.pam +++ pm-suspend-hybrid.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_console.so +#auth required pam_stack.so service=system-auth +account required pam_permit.so ++++++ pm-suspend.app (new) --- pm-suspend.app +++ pm-suspend.app @@ -0,0 +1 @@ +FALLBACK=true ++++++ pm-suspend.pam (new) --- pm-suspend.pam +++ pm-suspend.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_console.so +#auth required pam_stack.so service=system-auth +account required pam_permit.so ++++++ pm-utils-1.4.1.tar.gz (new) ++++++ pm-utils-10umount-SD.patch (new) --- pm-utils-10umount-SD.patch +++ pm-utils-10umount-SD.patch @@ -0,0 +1,52 @@ +diff -urN pm-utils-1.3.1.orig/pm/sleep.d/10umount_SD pm-utils-1.3.1/pm/sleep.d/10umount_SD +--- pm-utils-1.3.1.orig/pm/sleep.d/10umount_SD 1970-01-01 08:00:00.000000000 +0800 ++++ pm-utils-1.3.1/pm/sleep.d/10umount_SD 2011-03-03 10:54:05.000000000 +0800 +@@ -0,0 +1,26 @@ ++# Drop to: /etc/pm/sleep.d ++# Use this script to prevent data loss on mounted MMC/SD ++# cards. It syncs data and umounts all mmcblk devices prior to ++# suspend, and cancels suspend if umounting was not possible ++# (i.e: something locks a file) ++case "${1}" in ++ hibernate|suspend) ++ /bin/sync ++ for drive in $( /bin/ls /dev/mmcblk?p* ); do ++ /bin/umount ${drive} > /dev/null ++ # If umount failed: abort suspend ++ if [ $? -gt 0 ]; then ++ # Test if device keeps mounted. Previous command could fail ++ # (i.e device was not mounted) with a non-stopper ++ # problem for the suspend process. ++ /bin/mount | /bin/grep ${drive} ++ if [ $? -eq 0 ]; then ++ exit 1 ++ fi ++ fi ++ done ++ ;; ++# resume|thaw) ++## Do nothing. All devices will be automatically mounted again. ++# ;; ++esac +diff -urN pm-utils-1.3.1.orig/pm/sleep.d/Makefile.am pm-utils-1.3.1/pm/sleep.d/Makefile.am +--- pm-utils-1.3.1.orig/pm/sleep.d/Makefile.am 2010-07-04 22:42:51.000000000 +0800 ++++ pm-utils-1.3.1/pm/sleep.d/Makefile.am 2011-03-03 10:54:53.000000000 +0800 +@@ -4,6 +4,7 @@ + 00logging \ + 00powersave \ + 01grub \ ++ 10umount_SD \ + 49bluetooth \ + 55NetworkManager \ + 75modules \ +diff -urN pm-utils-1.3.1.orig/pm/sleep.d/Makefile.in pm-utils-1.3.1/pm/sleep.d/Makefile.in +--- pm-utils-1.3.1.orig/pm/sleep.d/Makefile.in 2010-07-04 23:01:21.000000000 +0800 ++++ pm-utils-1.3.1/pm/sleep.d/Makefile.in 2011-03-03 10:55:58.000000000 +0800 +@@ -158,6 +158,7 @@ + 00logging \ + 00powersave \ + 01grub \ ++ 10umount_SD \ + 49bluetooth \ + 55NetworkManager \ + 75modules \ ++++++ pm-utils-bugreport-info.sh (new) --- pm-utils-bugreport-info.sh +++ pm-utils-bugreport-info.sh @@ -0,0 +1,42 @@ +#!/bin/bash +shopt -s nullglob +exec 2>&1 +LANG=C + +echo SUSPEND LOG +cat /var/log/pm-suspend.log +echo ====== +echo SYS POWER +ls -lA /sys/power +echo ====== +echo SYS POWER STATE +cat /sys/power/state +echo ====== +echo SYS POWER DISK +cat /sys/power/disk +echo ====== +echo HAL INFO +lshal | egrep "(system.hardware.(product|vendor|version)|system.firmware.version|power_management.quirk)" +echo ====== +echo ETC PM +ls -lAR /etc/pm +for dir in /etc/pm/* +do + echo DIR ${dir} + for file in ${dir}/* + do + echo FILE $file + cat ${file} + echo ====== + done + echo ====== +done +echo UNAME +uname -a +echo ====== +echo RPM +rpm --qf '%{name}-%{version}-%{release}\n' -q kernel pm-utils hal hal-info gnome-power-manager vbetool radeontool hdparm +echo ====== +echo FEDORA RELEASE +cat /etc/fedora-release +echo ======
