diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2014-07-02 19:57:44 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:20:12 +0100 |
commit | fe483ca37c33ebfe4c3e391244c47969e1560aeb (patch) | |
tree | 4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch | |
parent | 107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff) | |
download | poky-fe483ca37c33ebfe4c3e391244c47969e1560aeb.tar.gz |
rpm: Upgrade to 5.4.14
Update various patches. A few corrections to the patch descriptions,
otherwise simple quilt refresh or conflict resolution.
Remove rpm-solvedb.patch and rpm-respect-arch.patch. These are both related
to the old solvedb package dependency solver. This is no longer used since
we moved to smartpm.
rpm-stub-out-git_strerror was a backport and is no longer needed.
RPM 5.4.12 and newer normally requires Berkley DB 6.0 or newer. A small
patch to configure allows RPM to dynamically select DB 5.3 or DB 6.0 based
on what is available at configure time.
(From OE-Core rev: 0c7b4a5e23836889196f85f472f081d51529e94e)
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-ossp-uuid.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch index db424b8493..691aba9ea3 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-ossp-uuid.patch | |||
@@ -8,10 +8,11 @@ Upstream-Status: Inappropriate [disable feature] | |||
8 | 8 | ||
9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
10 | 10 | ||
11 | diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac | 11 | Index: rpm-5.4.14/configure.ac |
12 | --- rpm-5.4.9.orig/configure.ac 2012-05-17 16:37:20.594790192 -0500 | 12 | =================================================================== |
13 | +++ rpm-5.4.9/configure.ac 2012-05-17 16:39:23.126933596 -0500 | 13 | --- rpm-5.4.14.orig/configure.ac |
14 | @@ -1909,7 +1909,7 @@ | 14 | +++ rpm-5.4.14/configure.ac |
15 | @@ -1951,7 +1951,7 @@ grep -v 'define HAVE_UNISTD_H' confdefs. | ||
15 | esac | 16 | esac |
16 | RPM_CHECK_LIB( | 17 | RPM_CHECK_LIB( |
17 | [OSSP uuid], [uuid], | 18 | [OSSP uuid], [uuid], |