***** hal-0.5.7.1-hibernate-fix-r1.patch ***** ============================================== PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < /usr/portage/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix-r1.patch ============================================== patching file tools/hal-system-power-suspend Here is the content of the hal-0.5.7.1-hibernate-fix-r1.patch-27989.out file: Hunk #1 FAILED at 62. 1 out of 1 hunk FAILED -- saving rejects to file tools/hal-system-power-suspend.rej ============================================== PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < /usr/portage/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix-r1.patch ============================================== can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- tools/hal-system-power-suspend 2006-02-19 00:00:55.000000000 +0100 |+++ tools/hal-system-power-suspend2 2006-09-23 11:22:42.000000000 +0200 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ============================================== PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch < /usr/portage/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix-r1.patch ============================================== missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- tools/hal-system-power-suspend 2006-02-19 00:00:55.000000000 +0100 |+++ tools/hal-system-power-suspend2 2006-09-23 11:22:42.000000000 +0200 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ============================================== PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch < /usr/portage/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix-r1.patch ============================================== missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- tools/hal-system-power-suspend 2006-02-19 00:00:55.000000000 +0100 |+++ tools/hal-system-power-suspend2 2006-09-23 11:22:42.000000000 +0200 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored ============================================== PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch < /usr/portage/sys-apps/hal/files/hal-0.5.7.1-hibernate-fix-r1.patch ============================================== missing header for unified diff at line 3 of patch can't find file to patch at input line 3 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |--- tools/hal-system-power-suspend 2006-02-19 00:00:55.000000000 +0100 |+++ tools/hal-system-power-suspend2 2006-09-23 11:22:42.000000000 +0200 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored
*** Bug 162627 has been marked as a duplicate of this bug. ***
*** Bug 162632 has been marked as a duplicate of this bug. ***
I have same error.
Same error too
*** Bug 162653 has been marked as a duplicate of this bug. ***
affirmative. Same bug here with fresh synced portage-tree. Ready to give some help in files or logs. Please tell me which if necessary.
(In reply to comment #6) > affirmative. Same bug here with fresh synced portage-tree. Ready to give some > help in files or logs. Please tell me which if necessary. > hibernate-fix.patch is OK, hibernate-fix-r1.patch is not quickfix: move the file, then emerge
Created attachment 107373 [details] Fixed ebuild - patch 0.5.7.1-hibernate-fix-r1.patch seems not to be necessary (already in the tarball) - missing '\' at the end of this line : --enable-hotplug-map \
(In reply to comment #8) > Created an attachment (id=107373) [edit] > Fixed ebuild > > - patch 0.5.7.1-hibernate-fix-r1.patch seems not to be necessary (already in > the tarball) oops : my mistake I didn't compare witht he right archive, forget it. > - missing '\' at the end of this line : > --enable-hotplug-map \ >
(In reply to comment #7) > hibernate-fix.patch is OK, hibernate-fix-r1.patch is not > > quickfix: move the file, then emerge So move hibernate-fix-r1.patch? from usr/portage/distfiles to anywhere? I would appreciate a short mail where this errorenous file can be found and to where it has to be moved. I'm new at deep system works like managing emerge-distfiles myself. Thanks. Do not want to blow up this bug. But if it's appropriate to tell me via a comment, feel free to do so. That would be mostly appreciated. *wink*
(In reply to comment #10) > (In reply to comment #7) > > hibernate-fix.patch is OK, hibernate-fix-r1.patch is not > > > > quickfix: move the file, then emerge > > So move hibernate-fix-r1.patch? from usr/portage/distfiles to anywhere? > I would appreciate a short mail where this errorenous file can be found and to > where it has to be moved. here is what I did on my PC : # cd /usr/portage/sys-apps/hal # nano -w hal-0.5.7.1-r3.ebuild change epatch "${FILESDIR}"/${PN}-0.5.7.1-hibernate-fix-r1.patch to epatch "${FILESDIR}"/${PN}-0.5.7.1-hibernate-fix.patch # ebuild hal-0.5.7.1-r3.ebuild digest then when reemerging I got : /usr/portage/sys-apps/hal/hal-0.5.7.1-r3.ebuild: line 147: --enable-hotplug-map: command not found so I had to change --with-data=${hwdata} to --with-data=${hwdata} \ and then everything went fine
(In reply to comment #11)> so I had to change --with-data=${hwdata} > to --with-data=${hwdata} \ > and then everything went fine Actually: - --with-data=${hwdata} \ + --with-hwdata=${hwdata} \
(In reply to comment #12) > (In reply to comment #11)> so I had to change --with-data=${hwdata} > > to --with-data=${hwdata} \ > > and then everything went fine > > Actually: > > - --with-data=${hwdata} \ > + --with-hwdata=${hwdata} \ These two comments did the trick for me. Now everything works. (thans)
Having looked at the files involved, there seems to be something missing in the tools/hal-system-power-suspend file, perhaps this file has been changed. The difference between the hal-0.5.7.1-hibernate-fix.patch and the hal-0.5.7.1-hibernate-fix-r1.patch is that the next line in r1 inspects /sys/power/state whereas the next line in the earlier patch doesn't. Perhaps this has been changed in other areas, I don't know, but I'm not a favor of just jumping back patches because they apply.
(In reply to comment #14) > The difference between the hal-0.5.7.1-hibernate-fix.patch and the > hal-0.5.7.1-hibernate-fix-r1.patch is that the next line in r1 inspects > /sys/power/state whereas the next line in the earlier patch doesn't. The primary difference is the file to patch: -fix-r1 is for -suspend where -fix was for -hibernate. This check of /sys/power/state is present in suspend, only there is another block in the place where the patch would add something: elif [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" = "pmu" ]; then ... This is not present in the tarball. Some grepping shows that those lines come from hal-0.5.7-hald-scripts.patch. So those two patches conflict. Now you'd only have to have an idea what all this is about and what order would be the correct one, and you could build a patch that applies after hald-scripts. Suggestions?
The patch came from bug 162624 comment 15 and has been marked obsolete by now. And bug 162624 comment 29 also mentions that this patch fails.
(In reply to comment #13) > (In reply to comment #12) > > (In reply to comment #11)> so I had to change --with-data=${hwdata} > > > to --with-data=${hwdata} \ > > > and then everything went fine > > > > Actually: > > > > - --with-data=${hwdata} \ > > + --with-hwdata=${hwdata} \ > > > These two comments did the trick for me. > Now everything works. (thans) > Me too. Thanks both of you.
Fixed before I even knew this bug existed...
