diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-23 11:28:21 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 17:00:27 +0000 |
commit | 007c284cb83cf5d98f3e4f605244ca6f1d46caea (patch) | |
tree | 32efe1a38e908bdc64ac59cad5f7b5e6b2d99ecf /meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch | |
parent | a27ca6da59e6939a5bbab641236f7f792c03694f (diff) | |
download | poky-007c284cb83cf5d98f3e4f605244ca6f1d46caea.tar.gz |
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any
diagnostic messages are ignored from the output of rpmresolve.
The patches have been split into bug fixes (things that belong upstream)
and local changes that are OE specific.
The following patches are obsolete and have been removed:
rpm-remove-sykcparse-decl.patch
fstack-protector-configure-check.patch
rpm-disable-Wno-override-init.patch
rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch
verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
(From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch b/meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch new file mode 100644 index 0000000000..adbef6df88 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-disable-blaketest.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | rpmio: Disable building of the tblake2 test(s). | ||
2 | |||
3 | There is some type of a dependency fault here that can occasionally result in: | ||
4 | |||
5 | gcc: error: tblake2b.o: No such file or directory | ||
6 | or | ||
7 | gcc: error: tblake2bp.o: No such file or directory | ||
8 | |||
9 | These items are simply test cases that are not packaged, so they can be | ||
10 | safely disabled to resolve the dependency issue. | ||
11 | |||
12 | Upstream-Status: Inappropriate [workaround] | ||
13 | |||
14 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
15 | |||
16 | Index: rpm-5.4.15/rpmio/Makefile.am | ||
17 | =================================================================== | ||
18 | --- rpm-5.4.15.orig/rpmio/Makefile.am | ||
19 | +++ rpm-5.4.15/rpmio/Makefile.am | ||
20 | @@ -29,7 +29,7 @@ EXTRA_PROGRAMS += bsdiff bspatch pcrsed | ||
21 | tmire todbc toid tperl tpython tput trpmio tsexp tsvn tsw ttcl \ | ||
22 | dumpasn1 lookup3 trel twitter github tmicrojson duk | ||
23 | |||
24 | -noinst_PROGRAMS += b2sum tset tblake2b tblake2bp tblake2s tblake2sp tgfs | ||
25 | +#noinst_PROGRAMS += b2sum tset tblake2b tblake2bp tblake2s tblake2sp tgfs | ||
26 | if WITH_LIBGIT2 | ||
27 | noinst_PROGRAMS += tgit | ||
28 | else | ||