diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-12-11 08:09:40 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-17 17:24:52 +0000 |
| commit | e1345b76c04b5a829b7219c12772bec1fb301850 (patch) | |
| tree | 793cf4775df349af9db83230272ea6d7bcc8b840 /meta/recipes-devtools/rpm/rpm/rpm-platform.patch | |
| parent | 8b671644e1fa5cb4e4d8b6b0dc26a4b08e7485b7 (diff) | |
| download | poky-e1345b76c04b5a829b7219c12772bec1fb301850.tar.gz | |
rpm/smart: Fix runtime-relocation issues w/ RPM and Smart
Fix runtime-relocation issues with the RPM and Smart wrappers.
In addition the patches were necessary to fix related problems.
The changes to the includes three categories of issues:
*) Incorrect pathname evaluations
*) Incorrect evaluation of the /etc/rpm/platform file contents
*) Confusing vendor #define checks
Finally, a simple way to debug the platformScore was added as
that is necessary to debug how this works and into the smart system.
(From OE-Core rev: 355a621caca66ed393d36fff6be8918921cf45ae)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-platform.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch index 7b81857837..9e167d82f3 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch | |||
| @@ -40,7 +40,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
| 40 | return rc; | 40 | return rc; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | +#if defined(RPM_VENDOR_WINDRIVER) | 43 | +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) |
| 44 | +#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo" | 44 | +#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo" |
| 45 | +#else | 45 | +#else |
| 46 | +#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo" | 46 | +#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo" |