diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-07 23:43:52 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:44 -0700 |
commit | 224549c911c656ea0529a2f87316b5e46cfb761b (patch) | |
tree | 178dd8fdd5276338e6d0197dedfa73e73488126f /meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch | |
parent | 7579acbbc479fe8ee631ea7e21a92961055d04a2 (diff) | |
download | meta-openembedded-224549c911c656ea0529a2f87316b5e46cfb761b.tar.gz |
openhpi: refresh patches
WARNING: openhpi-3.6.1-r0 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 openhpi-use-serial-tests-config-needed-by-ptest.patch
patching file configure.ac
Hunk #1 succeeded at 7 with fuzz 2.
Now at patch openhpi-use-serial-tests-config-needed-by-ptest.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch')
-rw-r--r-- | meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch index 51537ef128..3e09180d4d 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch | |||
@@ -13,19 +13,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
13 | configure.ac | 2 +- | 13 | configure.ac | 2 +- |
14 | 1 files changed, 1 insertions(+), 1 deletions(-) | 14 | 1 files changed, 1 insertions(+), 1 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | Index: openhpi-3.6.1/configure.ac |
17 | index 4b51971..16136b3 100644 | 17 | =================================================================== |
18 | --- a/configure.ac | 18 | --- openhpi-3.6.1.orig/configure.ac |
19 | +++ b/configure.ac | 19 | +++ openhpi-3.6.1/configure.ac |
20 | @@ -7,7 +7,7 @@ dnl various hacks by Sean Dague <http://dague.net/sean> 4/23/03 | 20 | @@ -7,7 +7,7 @@ dnl various hacks by Sean Dague <http: |
21 | AC_PREREQ(2.57) | 21 | AC_PREREQ(2.57) |
22 | AC_INIT(openhpi, 3.5.0) | 22 | AC_INIT(openhpi, 3.6.1) |
23 | AC_CONFIG_SRCDIR(openhpi.spec.in) | 23 | AC_CONFIG_SRCDIR(openhpi.spec.in) |
24 | -AM_INIT_AUTOMAKE([1.8]) | 24 | -AM_INIT_AUTOMAKE([1.8]) |
25 | +AM_INIT_AUTOMAKE([1.8 serial-tests]) | 25 | +AM_INIT_AUTOMAKE([1.8 serial-tests]) |
26 | 26 | ||
27 | AM_CONFIG_HEADER(config.h) | 27 | AM_CONFIG_HEADER(config.h) |
28 | AH_TOP([#ifndef __OPENHPI_CONFIG_H | 28 | AH_TOP([#ifndef __OPENHPI_CONFIG_H |
29 | -- | ||
30 | 1.7.1 | ||
31 | |||