diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 11:21:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-05 10:33:18 -0800 |
commit | 065dab7480ea0fae66db4b5a01d09814b1f38e03 (patch) | |
tree | 7918d9ebf20c38ccbffca4c79d7b8993e9d6f20d /meta/classes/package_rpm.bbclass | |
parent | 8144d51511956a6e046e3976bb4c4a08f1a29c79 (diff) | |
download | openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.gz openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.bz2 openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.tar.xz openembedded-core-065dab7480ea0fae66db4b5a01d09814b1f38e03.zip |
meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \
-e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data.expand *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index af8c63ed6..68313eccc 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -998,9 +998,9 @@ python do_package_rpm () { d.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch) else: d.setVar('PACKAGE_ARCH_EXTEND', package_arch) - pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d) - pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d) - magicfile = bb.data.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc', d) + pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') + pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}') + magicfile = d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc') bb.mkdirhier(pkgwritedir) os.chmod(pkgwritedir, 0755) |