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/rpm-platform-file-fix.patch | |
| parent | 04bb223110da2f92725c341bc3ec0cf26325f675 (diff) | |
| download | openembedded-core-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/rpm-platform-file-fix.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch index 1432b16244..f26a6e79da 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch @@ -4,11 +4,11 @@ information about the platform (cpu/vendor/os). Fixes #3864. Upstream-Status: Inappropriate [embedded specific] -diff --git a/lib/rpmrc.c b/lib/rpmrc.c -index e676601..9140bbe 100644 ---- a/lib/rpmrc.c -+++ b/lib/rpmrc.c -@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * platform) +Index: rpm-5.4.14/lib/rpmrc.c +=================================================================== +--- rpm-5.4.14.orig/lib/rpmrc.c ++++ rpm-5.4.14/lib/rpmrc.c +@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * pl #endif } @@ -16,7 +16,7 @@ index e676601..9140bbe 100644 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ /* do not use vendor and GNU attribution */ p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); -@@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * platform) +@@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * pl #endif xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre); p = _free(p); |