diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-12-11 08:09:40 -0600 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-12-14 15:17:19 -0800 |
| commit | 355a621caca66ed393d36fff6be8918921cf45ae (patch) | |
| tree | ae3728565bbc77c5cb78569b3afe83b801354aa7 /meta/recipes-devtools/python | |
| parent | 230068110e1cda349f9bf3886d8d06ac46deea37 (diff) | |
| download | openembedded-core-355a621caca66ed393d36fff6be8918921cf45ae.tar.gz openembedded-core-355a621caca66ed393d36fff6be8918921cf45ae.tar.bz2 openembedded-core-355a621caca66ed393d36fff6be8918921cf45ae.zip | |
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.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/python')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm_1.4.1.bb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb index 53f232bfab..04f61f8999 100644 --- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb +++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb @@ -11,7 +11,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "python rpm" -PR = "r4" +PR = "r5" SRCNAME = "smart" SRC_URI = "\ @@ -87,6 +87,21 @@ do_install_append() { fi } +add_native_wrapper() { + create_wrapper ${D}/${bindir}/smart \ + RPM_USRLIBRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('libdir', True), d.getVar('bindir', True))}/rpm \ + RPM_ETCRPM='$'{RPM_ETCRPM-'`dirname $''realpath`'/${@os.path.relpath(d.getVar('sysconfdir', True), d.getVar('bindir', True))}/rpm} \ + RPM_LOCALEDIRRPM='`dirname $''realpath`'/${@os.path.relpath(d.getVar('datadir', True), d.getVar('bindir', True))}/locale +} + +do_install_append_class-native() { + add_native_wrapper +} + +do_install_append_class-nativesdk() { + add_native_wrapper +} + PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc smartpm \ ${@base_contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \ ${@base_contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \ |