diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-22 13:01:42 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:43:47 +0000 |
| commit | bcec98bf1c0d3ff62852331ada5041b24eac6524 (patch) | |
| tree | 5ccb98c884219213dcf9d6aef1c04c77d90050e8 /meta | |
| parent | 0d9809c4ecf8ef45214cd2a26223ba52031fde75 (diff) | |
| download | poky-bcec98bf1c0d3ff62852331ada5041b24eac6524.tar.gz | |
package.bbclass: Ensure paths to rpmmarcos and rpmpopt are set
If rpm-native was built in an alternative location, it may not relocate correctly
unless the rpmpopt and macros paths are explicitly specified.
This fixes errors seen on the Yocto autobuilder where pkgconfig
"provides" entries could disappear leading to image dependency failures.
(From OE-Core rev: fb01bd81197057e62106aac966f9ebc4c5054f97)
(From OE-Core rev: 15f50ab3ee454dc3510801d61bb09bf37d78d1af)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/package.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 2847f852ba..deaa87b922 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
| @@ -1110,7 +1110,7 @@ if [ x"$D" = "x" ]; then | |||
| 1110 | fi | 1110 | fi |
| 1111 | } | 1111 | } |
| 1112 | 1112 | ||
| 1113 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc'" | 1113 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt" |
| 1114 | 1114 | ||
| 1115 | # Collect perfile run-time dependency metadata | 1115 | # Collect perfile run-time dependency metadata |
| 1116 | # Output: | 1116 | # Output: |