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:19:48 +0100 |
| commit | 0c7b4a5e23836889196f85f472f081d51529e94e (patch) | |
| tree | f300a95188e10f51ddd30f53ee2eff73e92d41ff /meta/recipes-devtools/rpm/rpm/header-include-fix.patch | |
| parent | 04bb223110da2f92725c341bc3ec0cf26325f675 (diff) | |
| download | openembedded-core-contrib-0c7b4a5e23836889196f85f472f081d51529e94e.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.
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/header-include-fix.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/header-include-fix.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch b/meta/recipes-devtools/rpm/rpm/header-include-fix.patch index 6aa072d7c8..5ffb187ff3 100644 --- a/meta/recipes-devtools/rpm/rpm/header-include-fix.patch +++ b/meta/recipes-devtools/rpm/rpm/header-include-fix.patch @@ -1,9 +1,9 @@ Upstream-Status: Pending -diff --git a/rpmdb/rpmdb.h b/rpmdb/rpmdb.h -index 0e1bdd7..8b522bb 100644 ---- a/rpmdb/rpmdb.h -+++ b/rpmdb/rpmdb.h +Index: rpm-5.4.14/rpmdb/rpmdb.h +=================================================================== +--- rpm-5.4.14.orig/rpmdb/rpmdb.h ++++ rpm-5.4.14/rpmdb/rpmdb.h @@ -9,6 +9,7 @@ #include <assert.h> @@ -12,10 +12,10 @@ index 0e1bdd7..8b522bb 100644 #include <rpmtypes.h> #include <rpmtag.h> /* XXX Header typedef */ -diff --git a/rpmdb/rpmtag.h b/rpmdb/rpmtag.h -index 8af6480..2166b4c 100644 ---- a/rpmdb/rpmtag.h -+++ b/rpmdb/rpmtag.h +Index: rpm-5.4.14/rpmdb/rpmtag.h +=================================================================== +--- rpm-5.4.14.orig/rpmdb/rpmtag.h ++++ rpm-5.4.14/rpmdb/rpmtag.h @@ -7,6 +7,7 @@ #include <rpmiotypes.h> |