Skip to content

Commit

Permalink
hddtemp: refresh patches
Browse files Browse the repository at this point in the history
WARNING: hddtemp-0.3-beta15-r1 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch hddtemp_0.3-beta15-52.diff
patching file doc/hddtemp.8
patching file po/fr.po
patching file po/ru.po
patching file po/sv.po
patching file po/pt.po
patching file po/de.po
patching file po/LINGUAS
patching file po/hddtemp.pot
patching file src/sata.c
patching file src/satacmds.c
patching file src/backtrace.c
patching file src/daemon.c
patching file src/hddtemp.c
Hunk #5 succeeded at 268 with fuzz 2 (offset 4 lines).
Hunk #6 succeeded at 283 (offset 4 lines).
Hunk #7 succeeded at 295 (offset 4 lines).
Hunk #8 succeeded at 372 (offset 4 lines).
Hunk #9 succeeded at 409 (offset 4 lines).
Hunk #10 succeeded at 483 (offset 4 lines).
Hunk #11 succeeded at 496 (offset 4 lines).
Hunk #12 succeeded at 510 (offset 4 lines).
Hunk #13 succeeded at 532 (offset 4 lines).
patching file src/ata.c
patching file src/hddtemp.h
patching file src/scsicmds.c

Now at patch hddtemp_0.3-beta15-52.diff

Signed-off-by: Armin Kuster <[email protected]>
  • Loading branch information
akuster committed Apr 13, 2018
1 parent 72d710c commit 527ed06
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 84 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ Auto-detect disks if none specified
Refer to:
https://bugzilla.redhat.com/show_bug.cgi?id=717479

diff -up hddtemp-0.3-beta15/doc/hddtemp.8~ hddtemp-0.3-beta15/doc/hddtemp.8
--- hddtemp-0.3-beta15/doc/hddtemp.8~ 2011-08-18 00:36:05.689001470 +0300
+++ hddtemp-0.3-beta15/doc/hddtemp.8 2011-08-18 00:44:46.753006253 +0300
Index: hddtemp-0.3-beta15/doc/hddtemp.8
===================================================================
--- hddtemp-0.3-beta15.orig/doc/hddtemp.8
+++ hddtemp-0.3-beta15/doc/hddtemp.8
@@ -19,7 +19,7 @@
hddtemp \- Utility to monitor hard drive temperature
.SH SYNOPSIS
Expand All @@ -25,9 +26,10 @@ diff -up hddtemp-0.3-beta15/doc/hddtemp.8~ hddtemp-0.3-beta15/doc/hddtemp.8


.SH "OPTIONS"
diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c
--- hddtemp-0.3-beta15/src/hddtemp.c~ 2011-08-18 00:36:05.638996861 +0300
+++ hddtemp-0.3-beta15/src/hddtemp.c 2011-08-18 00:35:55.485060798 +0300
Index: hddtemp-0.3-beta15/src/hddtemp.c
===================================================================
--- hddtemp-0.3-beta15.orig/src/hddtemp.c
+++ hddtemp-0.3-beta15/src/hddtemp.c
@@ -54,6 +54,7 @@
#include <linux/hdreg.h>
#include <ctype.h>
Expand All @@ -44,7 +46,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c

backtrace_sigsegv();
backtrace_sigill();
@@ -419,11 +421,6 @@ int main(int argc, char* argv[]) {
@@ -423,11 +425,6 @@ int main(int argc, char* argv[]) {
exit(0);
}

Expand All @@ -56,7 +58,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c
if(debug) {
/* argc = optind + 1;*/
quiet = 1;
@@ -434,6 +431,23 @@ int main(int argc, char* argv[]) {
@@ -438,6 +435,23 @@ int main(int argc, char* argv[]) {
exit(1);
}

Expand All @@ -80,7 +82,7 @@ diff -up hddtemp-0.3-beta15/src/hddtemp.c~ hddtemp-0.3-beta15/src/hddtemp.c
init_bus_types();

/* collect disks informations */
@@ -527,6 +541,7 @@ int main(int argc, char* argv[]) {
@@ -531,6 +545,7 @@ int main(int argc, char* argv[]) {
else {
do_direct_mode(ldisks);
}
Expand Down
Loading

0 comments on commit 527ed06

Please sign in to comment.