summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-12-22 19:01:35 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-24 10:05:44 +0000
commit77edb006bb3509c741775fad322a48ba8fea61df (patch)
tree853064c2407ba9301168b5b2d5b7bd62eb1f216b /meta/classes/package_rpm.bbclass
parent79bb1cc3111bab5935c229729ec8a039e1e2787a (diff)
downloadpoky-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_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 93a4c3123c..469526be7a 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -941,7 +941,7 @@ python do_package_rpm () {
941 d.setVar('PACKAGE_ARCH_EXTEND', package_arch) 941 d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
942 pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d) 942 pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d)
943 pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d) 943 pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d)
944 magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d) 944 magicfile = bb.data.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc', d)
945 bb.mkdirhier(pkgwritedir) 945 bb.mkdirhier(pkgwritedir)
946 os.chmod(pkgwritedir, 0755) 946 os.chmod(pkgwritedir, 0755)
947 947