summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/quilt/quilt-native.inc3
-rw-r--r--meta/recipes-devtools/quilt/quilt.inc9
-rw-r--r--meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch29
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.65.bb10
4 files changed, 38 insertions, 13 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc
index fce5fa1888..c7067042e6 100644
--- a/meta/recipes-devtools/quilt/quilt-native.inc
+++ b/meta/recipes-devtools/quilt/quilt-native.inc
@@ -5,8 +5,7 @@ INHIBIT_AUTOTOOLS_DEPS = "1"
5inherit native 5inherit native
6 6
7PATCHTOOL = "patch" 7PATCHTOOL = "patch"
8EXTRA_OECONF = "--disable-nls" 8EXTRA_OECONF_append = " --disable-nls"
9EXTRA_OECONF_append_class-target = "--with-perl=perl"
10 9
11do_configure () { 10do_configure () {
12 oe_runconf 11 oe_runconf
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 57e2a14a4a..c7bb741b4c 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -8,6 +8,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
8 file://run-ptest \ 8 file://run-ptest \
9 file://Makefile \ 9 file://Makefile \
10 file://test.sh \ 10 file://test.sh \
11 file://0001-tests-Allow-different-output-from-mv.patch \
11" 12"
12 13
13SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6" 14SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6"
@@ -33,10 +34,16 @@ RDEPENDS_${PN} = "bash"
33EXTRA_OE_MAKE_ARGS_darwin ?= "" 34EXTRA_OE_MAKE_ARGS_darwin ?= ""
34EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" 35EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}"
35 36
36EXTRA_OECONF = "--with-perl=perl" 37EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch"
37 38
38CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" 39CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
39 40
41# Make sure we don't have "-w" in shebang lines: it breaks using
42# "/usr/bin/env perl" as parser
43do_configure_prepend () {
44 find ${S} -name "*.in" -exec sed -i -e "1s,^#\!.*@PERL@ -w$,#\! @PERL@\nuse warnings;," {} \;
45}
46
40# Don't setup symlinks to host utilities, we don't need them 47# Don't setup symlinks to host utilities, we don't need them
41do_configure_append () { 48do_configure_append () {
42 sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile 49 sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile
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
diff --git a/meta/recipes-devtools/quilt/quilt_0.65.bb b/meta/recipes-devtools/quilt/quilt_0.65.bb
index 00f900a112..12859f0bcc 100644
--- a/meta/recipes-devtools/quilt/quilt_0.65.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.65.bb
@@ -4,13 +4,3 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
4SRC_URI += "file://aclocal.patch \ 4SRC_URI += "file://aclocal.patch \
5 file://gnu_patch_test_fix_target.patch \ 5 file://gnu_patch_test_fix_target.patch \
6 " 6 "
7
8# fix build-distro specific perl path in the target perl scripts
9do_install_append() {
10 for perlscript in ${D}${datadir}/quilt/scripts/remove-trailing-ws ${D}${datadir}/quilt/scripts/dependency-graph ${D}${datadir}/quilt/scripts/edmail ${D}${bindir}/guards
11 do
12 if [ -f $perlscript ]; then
13 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' $perlscript
14 fi
15 done
16}