mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
Armin Kuster
68c8fe1aba
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>
30 lines
997 B
Diff
30 lines
997 B
Diff
From 9bcec221a2bb438d8a9ed59aed846ffe3be9cffa Mon Sep 17 00:00:00 2001
|
|
From: Jackie Huang <jackie.huang@windriver.com>
|
|
Date: Tue, 19 Jul 2016 01:56:23 -0400
|
|
Subject: [PATCH] squid: use serial-tests config needed by ptest
|
|
|
|
ptest needs buildtest-TESTS and runtest-TESTS targets.
|
|
serial-tests is required to generate those targets.
|
|
|
|
Upstream-Status: Inappropriate [default automake behavior incompatible with ptest]
|
|
|
|
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|
|
|
---
|
|
configure.ac | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 3827222..504a844 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -10,7 +10,7 @@ AC_PREREQ(2.61)
|
|
AC_CONFIG_HEADERS([include/autoconf.h])
|
|
AC_CONFIG_AUX_DIR(cfgaux)
|
|
AC_CONFIG_SRCDIR([src/main.cc])
|
|
-AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects])
|
|
+AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects serial-tests])
|
|
AC_REVISION($Revision$)dnl
|
|
AC_PREFIX_DEFAULT(/usr/local/squid)
|
|
AM_MAINTAINER_MODE
|