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-don-t-do-squid-conf-tests-at-build-time.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-don-t-do-squid-conf-tests-at-build-time.patch')
| -rw-r--r-- | meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch index 312f44f8eb..e5267ea2b2 100644 --- a/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch +++ b/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch @@ -1,4 +1,4 @@ -From 54a9c2ba60adc7ec2724786662fd398e7c03999f Mon Sep 17 00:00:00 2001 +From 8786b91488dae3f6dfeadd686e80d2ffc5c29320 Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Thu, 25 Aug 2016 15:22:57 +0800 Subject: [PATCH] squid: don't do squid-conf-tests at build time @@ -14,12 +14,13 @@ Subject: [PATCH] squid: don't do squid-conf-tests at build time Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + --- test-suite/Makefile.am | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am -index d5468be..77fc480 100644 +index 061a463..350dfb2 100644 --- a/test-suite/Makefile.am +++ b/test-suite/Makefile.am @@ -41,8 +41,7 @@ TESTS += debug \ @@ -58,6 +59,3 @@ index d5468be..77fc480 100644 else break; fi; \ done; \ if test "$$failed" -eq 0; then cp $(TRUE) $@ ; fi --- -2.8.3 - |