diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2011-02-15 22:20:49 -0600 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2011-02-16 07:34:51 -0800 |
| commit | ca649ef8253cbf69062322b5bdee4123ee4c4eca (patch) | |
| tree | e6006e59ece4109391ddd09ad683bc28821cce5d /meta/recipes-devtools/rpm/rpm/rpm-showrc.patch | |
| parent | 0e4aa13e9eef50533d8385b7fa638f33d4248e78 (diff) | |
| download | openembedded-core-contrib-ca649ef8253cbf69062322b5bdee4123ee4c4eca.tar.gz | |
rpm: Add the ability to use the platform file during install
Add a new rpm macro, rpmrc_platform_path to specify an alternative platform
file. This is required to allow the dep resolver to identify compatible
packages.
Also workaround a minor problem with the --showrc command in RPM. A bug
has been reported upstream on this.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-showrc.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-showrc.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch new file mode 100644 index 0000000000..5051ce604b --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch @@ -0,0 +1,23 @@ +Workaround for a memory leak in --showrc. + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c +--- rpm-5.4.0.orig/lib/rpmrc.c 2011-02-15 20:40:13.006853913 -0600 ++++ rpm-5.4.0/lib/rpmrc.c 2011-02-15 20:44:39.708972391 -0600 +@@ -1216,11 +1223,15 @@ + if (DNEVR != NULL) + fprintf(fp, " %s\n", DNEVR+2); + } ++#if 0 + (void)rpmdsFree(ds); + ds = NULL; ++#endif + fprintf(fp, "\n"); + } ++#if 0 + PRCO = rpmdsFreePRCO(PRCO); ++#endif + } + + if (rpmIsVerbose()) { |