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-platform-file-fix.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-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. | |||
4 | 4 | ||
5 | Upstream-Status: Inappropriate [embedded specific] | 5 | Upstream-Status: Inappropriate [embedded specific] |
6 | 6 | ||
7 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c | 7 | Index: rpm-5.4.14/lib/rpmrc.c |
8 | index e676601..9140bbe 100644 | 8 | =================================================================== |
9 | --- a/lib/rpmrc.c | 9 | --- rpm-5.4.14.orig/lib/rpmrc.c |
10 | +++ b/lib/rpmrc.c | 10 | +++ rpm-5.4.14/lib/rpmrc.c |
11 | @@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * platform) | 11 | @@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * pl |
12 | #endif | 12 | #endif |
13 | } | 13 | } |
14 | 14 | ||
@@ -16,7 +16,7 @@ index e676601..9140bbe 100644 | |||
16 | #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ | 16 | #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ |
17 | /* do not use vendor and GNU attribution */ | 17 | /* do not use vendor and GNU attribution */ |
18 | p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); | 18 | p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); |
19 | @@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * platform) | 19 | @@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * pl |
20 | #endif | 20 | #endif |
21 | xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre); | 21 | xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre); |
22 | p = _free(p); | 22 | p = _free(p); |