diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2011-12-22 19:01:35 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-24 10:05:44 +0000 |
| commit | 77edb006bb3509c741775fad322a48ba8fea61df (patch) | |
| tree | 853064c2407ba9301168b5b2d5b7bd62eb1f216b /meta/classes/package.bbclass | |
| parent | 79bb1cc3111bab5935c229729ec8a039e1e2787a (diff) | |
| download | poky-77edb006bb3509c741775fad322a48ba8fea61df.tar.gz | |
package.bbclass: Adjust RPM call to use dynamic location for magic files
The magic file could be installed somewhere else if the system native prefix
settings are changed. Adjust the packaging files to compensate for this.
(From OE-Core rev: 93c0e9915b5c9bf8b0877c76f89de721adfbfd66)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
| -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 39c1d4bc91..9040eb40ba 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
| @@ -1113,7 +1113,7 @@ if [ x"$D" = "x" ]; then | |||
| 1113 | fi | 1113 | fi |
| 1114 | } | 1114 | } |
| 1115 | 1115 | ||
| 1116 | 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" | 1116 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/bin/rpmdeps --macros ${STAGING_LIBDIR_NATIVE}/rpm/macros --define '_rpmfc_magic_path ${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc' --rpmpopt ${STAGING_LIBDIR_NATIVE}/rpm/rpmpopt" |
| 1117 | 1117 | ||
| 1118 | # Collect perfile run-time dependency metadata | 1118 | # Collect perfile run-time dependency metadata |
| 1119 | # Output: | 1119 | # Output: |