diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-04-07 15:25:18 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:40 -0700 |
commit | 68c8fe1aba92ca2ed5e1156fa0050609ab4f73af (patch) | |
tree | 0b97556ce77ef357924cab0df45284778f8a08f6 /meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch | |
parent | c3b41c1f3cdb3f2c4b39e295c36c01a1b43abb74 (diff) | |
download | meta-openembedded-68c8fe1aba92ca2ed5e1156fa0050609ab4f73af.tar.gz |
squid: refresh patches
ARNING:
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:
checking file configure.ac
Hunk #1 succeeded at 27 with fuzz 1 (offset 8 lines).
and others
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch')
-rw-r--r-- | meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch index 01ec596223..9c75f17e70 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bd58d3672bc267824000f34a37561c7ab2bd571f Mon Sep 17 00:00:00 2001 | 1 | From 9bcec221a2bb438d8a9ed59aed846ffe3be9cffa Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Tue, 19 Jul 2016 01:56:23 -0400 | 3 | Date: Tue, 19 Jul 2016 01:56:23 -0400 |
4 | Subject: [PATCH] squid: use serial-tests config needed by ptest | 4 | Subject: [PATCH] squid: use serial-tests config needed by ptest |
@@ -9,12 +9,13 @@ serial-tests is required to generate those targets. | |||
9 | Upstream-Status: Inappropriate [default automake behavior incompatible with ptest] | 9 | Upstream-Status: Inappropriate [default automake behavior incompatible with ptest] |
10 | 10 | ||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | configure.ac | 2 +- | 14 | configure.ac | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 16 | ||
16 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
17 | index 05ad027..e324b93 100644 | 18 | index 3827222..504a844 100644 |
18 | --- a/configure.ac | 19 | --- a/configure.ac |
19 | +++ b/configure.ac | 20 | +++ b/configure.ac |
20 | @@ -10,7 +10,7 @@ AC_PREREQ(2.61) | 21 | @@ -10,7 +10,7 @@ AC_PREREQ(2.61) |
@@ -26,6 +27,3 @@ index 05ad027..e324b93 100644 | |||
26 | AC_REVISION($Revision$)dnl | 27 | AC_REVISION($Revision$)dnl |
27 | AC_PREFIX_DEFAULT(/usr/local/squid) | 28 | AC_PREFIX_DEFAULT(/usr/local/squid) |
28 | AM_MAINTAINER_MODE | 29 | AM_MAINTAINER_MODE |
29 | -- | ||
30 | 2.8.1 | ||
31 | |||