diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-02-25 17:34:20 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@windriver.com> | 2011-02-25 17:34:20 -0600 |
| commit | 6c6d4f4bffd9ada3bc89728f8b4812f02ce36fe9 (patch) | |
| tree | d47e53144f6015791b3c276a9c73121028e8663a /meta/recipes-devtools/rpm | |
| parent | 08c8f7bb7375a6f51c12ee5e7808e38e914d5413 (diff) | |
| download | poky-6c6d4f4bffd9ada3bc89728f8b4812f02ce36fe9.tar.gz | |
rpm: Fix rpm usage of prelink on the target
RPM has the ability to validate files that have been prelinked, however
the necessary configuration and staging was not done properly. Resolve
this issue by fixing the macro paths, providing the missing RPM macro,
and correcting a defect in the way the prelink image class was working
with the necessary configuration file.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/rpm')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 8bce395483..e350150cf6 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb | |||
| @@ -74,7 +74,8 @@ inherit autotools gettext | |||
| 74 | acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" | 74 | acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java" |
| 75 | 75 | ||
| 76 | # Specify the default rpm macros in terms of adjustable variables | 76 | # Specify the default rpm macros in terms of adjustable variables |
| 77 | rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" | 77 | rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:%{_etcrpm}/macros.*:%{_etcrpm}/macros:%{_etcrpm}/%{_target}/macros:~/.oerpmmacros" |
| 78 | rpm_macros_virtclass-native = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros" | ||
| 78 | 79 | ||
| 79 | # Configure values taken from rpm.spec | 80 | # Configure values taken from rpm.spec |
| 80 | WITH_BZIP2 = "--with-bzip2" | 81 | WITH_BZIP2 = "--with-bzip2" |