summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt/quilt
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-03-30 19:49:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-05 23:22:13 +0100
commite908ffe3cddd767cc1df4803e5ac8aed9f369bb1 (patch)
treed3bbfe036e2ba49953f0112e29b07ba555954ca3 /meta/recipes-devtools/quilt/quilt
parent9cacf8488ca2f7de346ce3085d312ee017e4e39f (diff)
downloadpoky-e908ffe3cddd767cc1df4803e5ac8aed9f369bb1.tar.gz
quilt: Fix paths for patch and perl
Currently some shebang lines end up as #! /usr/bin/env perl -w env does not like the argument. Also the current sed to insert env does not cover the copies ptests use. Fix these issues by: - using --with-perl to insert "env" - Replacing "-w" in shebang lines with a new "use warning;" line Remove a EXTRA_OECONF_append_class_target from the native recipe. Don't overwrite EXTRA_OECONF in native: the values should be correct for native as well. --with-patch is used within the gnu patch wrapper only: before this commit the wrapper contained a (build host) path to native patch. Also tweak one test so busybox mv output is accepted. All ptests should now pass: Fixes [YOCTO #11221]. (From OE-Core rev: 4b667d268fe410a21cacaecd1b5e3bfbbe7d53d8) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/quilt/quilt')
-rw-r--r--meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch b/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch
new file mode 100644
index 0000000000..21219a0bba
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch
@@ -0,0 +1,29 @@
1From 1530138960cfafbeefb95f2a760954c00b4d0ef0 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed, 29 Mar 2017 15:11:59 +0300
4Subject: [PATCH] tests: Allow different output from mv
5
6busybox mv has different error messages: fix the test
7
8Upstream-Status: Inappropriate [embedded]
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10---
11 test/failbackup.test | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/test/failbackup.test b/test/failbackup.test
15index 37046f7..fce6725 100644
16--- a/test/failbackup.test
17+++ b/test/failbackup.test
18@@ -16,7 +16,7 @@ What happens when refresh fails because of a permission error?
19 $ cat > test.txt
20 < This is updated test.txt.
21 $ quilt refresh --backup
22- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission denied
23+ >~ mv: .*: Permission denied
24 $ echo %{?}
25 > 1
26
27--
282.1.4
29