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-debug-platform.patch | |
| parent | 107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff) | |
| download | ast2050-yocto-poky-fe483ca37c33ebfe4c3e391244c47969e1560aeb.zip ast2050-yocto-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-debug-platform.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch index 25ebbdc..2eb6e0f 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-debug-platform.patch @@ -1,9 +1,9 @@ Debug the platform score generation... -Index: rpm-5.4.9/lib/rpmrc.c +Index: rpm-5.4.14/lib/rpmrc.c =================================================================== ---- rpm-5.4.9.orig/lib/rpmrc.c -+++ rpm-5.4.9/lib/rpmrc.c +--- rpm-5.4.14.orig/lib/rpmrc.c ++++ rpm-5.4.14/lib/rpmrc.c @@ -465,6 +465,8 @@ static rpmRC rpmPlatform(const char * pl rc = (rpmRC) rpmiobSlurp(platform, &iob); @@ -38,18 +38,18 @@ Index: rpm-5.4.9/lib/rpmrc.c } + fprintf(stderr, "D: rpmPlatform mireAppend STRCMP %s -- ", p); + #if !defined(RPM_VENDOR_OE) /* Skip the explicit-platform */ #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ /* do not use vendor and GNU attribution */ - p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); -@@ -518,6 +527,7 @@ static rpmRC rpmPlatform(const char * pl +@@ -519,6 +528,7 @@ static rpmRC rpmPlatform(const char * pl (cvog && *cvog->gnu ? "-" : NULL), (cvog ? cvog->gnu : NULL), NULL); #endif + fprintf(stderr, "%s\n", p); xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre); p = _free(p); - -@@ -686,9 +696,12 @@ int rpmPlatformScore(const char * platfo + #endif +@@ -688,9 +698,12 @@ int rpmPlatformScore(const char * platfo if ((mire = (miRE) mi_re) != NULL) for (i = 0; i < mi_nre; i++) { |
