Done, please review. Regards, Yin, Yan
> -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Selbak, Rolla N > Sent: Saturday, October 16, 2010 1:11 AM > To: [email protected]; [email protected] > Subject: Re: [meego-packaging] [meego-commits] 8514: Changes to > MeeGo:1.1:Core:Testing/pm-utils > > Btw, I know this is a small patch, but can you please rename your patch to > something more intuitive next time, instead of just the bug #? > > fix-bmc-#3932.patch > > Thanks, > > rs > > > On 10/15/10 7:55 AM, "Yan Yin" <[email protected]> wrote: > > Hi, > I have made the following changes to pm-utils in project > MeeGo:1.1:Core:Testing. Please review and accept ASAP. > > Thank You, > Yan Yin > > [This message was auto-generated] > > --- > > Request #8514: > > submit: > home:yyin2:branches:MeeGo:1.1:Core:Testing/pm-utils(r3)(cleanup) -> > MeeGo:1.1:Core:Testing/pm-utils > > > Message: > Fix BMC#3932: Failed to resume from S3 sometimes on dellmini1012 > > State: new 2010-10-15T07:55:56 yyin2 > Comment: None > > > > changes files: > -------------- > --- pm-utils.changes > +++ pm-utils.changes > @@ -0,0 +1,3 @@ > +* Wed Oct 13 2010 Yan Yin <[email protected]> - 1.3.1 > +- Fix BMC#3932: Failed to resume from S3 sometimes on dellmini1012 > + > > new: > ---- > fix-bmc-#3932.patch > > spec files: > ----------- > --- pm-utils.spec > +++ pm-utils.spec > @@ -23,6 +23,7 @@ > Source14: pm-suspend-hybrid.app > > Source23: pm-utils-bugreport-info.sh > +Patch0 : fix-bmc-#3932.patch > > > BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > @@ -45,6 +46,7 @@ > > %prep > %setup -q > +%patch0 -p1 > > > %build > > other changes: > -------------- > > ++++++ fix-bmc-#3932.patch (new) > --- fix-bmc-#3932.patch > +++ fix-bmc-#3932.patch > +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 \ > > _______________________________________________ > Meego-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits > > _______________________________________________ > MeeGo-packaging mailing list > [email protected] > http://lists.meego.com/listinfo/meego-packaging _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
