summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-02-15 22:20:49 -0600
committerSaul Wold <sgw@linux.intel.com>2011-02-16 07:34:51 -0800
commitca649ef8253cbf69062322b5bdee4123ee4c4eca (patch)
treee6006e59ece4109391ddd09ad683bc28821cce5d /meta/recipes-devtools/rpm/rpm/rpm-showrc.patch
parent0e4aa13e9eef50533d8385b7fa638f33d4248e78 (diff)
downloadpoky-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.patch23
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 @@
1Workaround for a memory leak in --showrc.
2
3Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
4
5diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c
6--- rpm-5.4.0.orig/lib/rpmrc.c 2011-02-15 20:40:13.006853913 -0600
7+++ rpm-5.4.0/lib/rpmrc.c 2011-02-15 20:44:39.708972391 -0600
8@@ -1216,11 +1223,15 @@
9 if (DNEVR != NULL)
10 fprintf(fp, " %s\n", DNEVR+2);
11 }
12+#if 0
13 (void)rpmdsFree(ds);
14 ds = NULL;
15+#endif
16 fprintf(fp, "\n");
17 }
18+#if 0
19 PRCO = rpmdsFreePRCO(PRCO);
20+#endif
21 }
22
23 if (rpmIsVerbose()) {