summaryrefslogtreecommitdiffstats
path: root/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt
diff options
context:
space:
mode:
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt')
-rw-r--r--import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch29
-rw-r--r--import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/Makefile13
-rw-r--r--import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch26
-rwxr-xr-ximport-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/run-ptest8
-rwxr-xr-ximport-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/test.sh1
5 files changed, 0 insertions, 77 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch b/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch
deleted file mode 100644
index 21219a0bb..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1530138960cfafbeefb95f2a760954c00b4d0ef0 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Wed, 29 Mar 2017 15:11:59 +0300
-Subject: [PATCH] tests: Allow different output from mv
-
-busybox mv has different error messages: fix the test
-
-Upstream-Status: Inappropriate [embedded]
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- test/failbackup.test | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/failbackup.test b/test/failbackup.test
-index 37046f7..fce6725 100644
---- a/test/failbackup.test
-+++ b/test/failbackup.test
-@@ -16,7 +16,7 @@ What happens when refresh fails because of a permission error?
- $ cat > test.txt
- < This is updated test.txt.
- $ quilt refresh --backup
-- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission denied
-+ >~ mv: .*: Permission denied
- $ echo %{?}
- > 1
-
---
-2.1.4
-
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/Makefile b/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/Makefile
deleted file mode 100644
index 7b3ac8a49..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-PATH := $(CURDIR)/bin:$(CURDIR)/compat:$(PATH)
-QUILT_DIR := $(CURDIR)/quilt
-QUILTRC := $(CURDIR)/test/test.quiltrc
-export QUILT_DIR QUILTRC
-CHECK_ENV := P=patches/; _P=../patches/; export P _P
--include test/.depend
-
-check-% : test/%.test
- @LANG=C; LC_ALL=C; \
- export LANG LC_ALL; \
- $(CHECK_ENV); \
- cd $(<D); \
- ./run -q $(<F)
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
deleted file mode 100644
index 672155bb6..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
-the test should be skipped for cross compiling.
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index 026a36c..8af591b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,6 +245,7 @@ fi
- QUILT_COMPAT_PROG_PATH(DIFF, diff)
- QUILT_COMPAT_PROG_PATH(PATCH, patch)
-
-+if test "x$cross_compiling" != "xyes"; then
- # Sun diff and others will not work because GNU patch options are used.
- AC_MSG_CHECKING([the version of $DIFF])
- if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
-@@ -293,6 +294,7 @@ current version of patch from ftp.gnu.org, or if you already have GNU patch
- then you can supply its path with the '--with-patch=' option.
- ])
- fi
-+fi
-
- QUILT_COMPAT_PROG_PATH(FIND, find)
-
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/run-ptest b/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/run-ptest
deleted file mode 100755
index 4b808aee4..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/run-ptest
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-THIS_SH=/bin/sh
-ln -sf /bin/ed /usr/bin/ed
-/usr/sbin/adduser --disabled-password quilttest
-su -c "${THIS_SH} ./test.sh" quilttest
-/usr/sbin/deluser quilttest
-rm -f /usr/bin/ed
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/test.sh b/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/test.sh
deleted file mode 100755
index 6563e4a2f..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/quilt/quilt/test.sh
+++ /dev/null
@@ -1 +0,0 @@
-for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? -eq 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done
OpenPOWER on IntegriCloud