diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 10:05:37 -0700 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-22 21:26:31 -0400 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-devtools/quilt/quilt | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/quilt/quilt')
5 files changed, 77 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch b/poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch new file mode 100644 index 000000000..21219a0bb --- /dev/null +++ b/poky/meta/recipes-devtools/quilt/quilt/0001-tests-Allow-different-output-from-mv.patch @@ -0,0 +1,29 @@ +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/poky/meta/recipes-devtools/quilt/quilt/Makefile b/poky/meta/recipes-devtools/quilt/quilt/Makefile new file mode 100644 index 000000000..7b3ac8a49 --- /dev/null +++ b/poky/meta/recipes-devtools/quilt/quilt/Makefile @@ -0,0 +1,13 @@ +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/poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file mode 100644 index 000000000..672155bb6 --- /dev/null +++ b/poky/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch @@ -0,0 +1,26 @@ +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/poky/meta/recipes-devtools/quilt/quilt/run-ptest b/poky/meta/recipes-devtools/quilt/quilt/run-ptest new file mode 100755 index 000000000..4b808aee4 --- /dev/null +++ b/poky/meta/recipes-devtools/quilt/quilt/run-ptest @@ -0,0 +1,8 @@ +#!/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/poky/meta/recipes-devtools/quilt/quilt/test.sh b/poky/meta/recipes-devtools/quilt/quilt/test.sh new file mode 100755 index 000000000..6563e4a2f --- /dev/null +++ b/poky/meta/recipes-devtools/quilt/quilt/test.sh @@ -0,0 +1 @@ +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 |