diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-02-12 13:05:19 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:35 +0000 |
commit | a8bf4da183824caa5fceaf7546db52daa05f8662 (patch) | |
tree | e327a549dd1c6765ad3c7a462e6a82a6316947fa /meta-selftest | |
parent | 69e549a841a1681f927667f5017a1cd669ac9914 (diff) | |
download | openembedded-core-a8bf4da183824caa5fceaf7546db52daa05f8662.tar.gz openembedded-core-a8bf4da183824caa5fceaf7546db52daa05f8662.tar.bz2 openembedded-core-a8bf4da183824caa5fceaf7546db52daa05f8662.zip |
oe-selftest: fix tests to reflect man->man-db transition
Rather than apply a patch twice, an incorrect patch is applied
(as the new man-db recipe does not have any patches yet).
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta-selftest')
-rw-r--r-- | meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch | 22 | ||||
-rw-r--r-- | meta-selftest/recipes-test/man-db/man-db_%.bbappend (renamed from meta-selftest/recipes-test/man/man_1.6g.bbappend) | 0 | ||||
-rw-r--r-- | meta-selftest/recipes-test/man/man/man-1.5h1-make.patch | 16 |
3 files changed, 22 insertions, 16 deletions
diff --git a/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch new file mode 100644 index 0000000000..b1d5eab2b8 --- /dev/null +++ b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch @@ -0,0 +1,22 @@ +From efc8831f33106e6b48de8e612c2d816fe7d1ae68 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 9 Feb 2018 17:37:48 +0200 +Subject: [PATCH] Test patch here! + +This is an invalid patch used by oe-selftest +--- + README | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/README b/README +index 48fff57..26d1234 100644 +--- a/README ++++ b/README +@@ -1,3 +1,4 @@ ++This is a test patch for purposes of oe-selftest + THIS LINE MAKES THIS PATCH INVALID README for the man-db manual pager suite + ======================================== + +-- +2.15.1 + diff --git a/meta-selftest/recipes-test/man/man_1.6g.bbappend b/meta-selftest/recipes-test/man-db/man-db_%.bbappend index 205720982c..205720982c 100644 --- a/meta-selftest/recipes-test/man/man_1.6g.bbappend +++ b/meta-selftest/recipes-test/man-db/man-db_%.bbappend diff --git a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch b/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch deleted file mode 100644 index a0d59b78ce..0000000000 --- a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch +++ /dev/null @@ -1,16 +0,0 @@ -Test patch here! -This is invalid patch used by tests in scripts/lib/selftests. - ---- man-1.5g/man/Makefile.in.mike Fri Apr 9 13:35:54 1999 -+++ man-1.5g/man/Makefile.in Fri Apr 9 13:36:45 1999 -@@ -1,8 +1,8 @@ - #MAKE THIS PATCH INVALID - MAN1 = man whatis apropos --MAN5 = man.conf -+MAN5 = man.config - MAN8 = makewhatis --ALL = man.1 whatis.1 apropos.1 man.conf.5 -+ALL = man.1 whatis.1 apropos.1 man.config.5 - MAYBE8 = makewhatis - - .SUFFIXES: .man .1 .5 .8 |