diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-01-27 17:36:34 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-13 09:43:21 +0000 |
| commit | 8f331db8136c8bf28ceea7f8ae410eb9d83225ad (patch) | |
| tree | 5ce43933b5c28d4d48ac583cf0cff31887e19261 | |
| parent | de6ed676712f79e54a32000a1b090eb918c939b9 (diff) | |
| download | openembedded-core-8f331db8136c8bf28ceea7f8ae410eb9d83225ad.tar.gz openembedded-core-8f331db8136c8bf28ceea7f8ae410eb9d83225ad.tar.bz2 openembedded-core-8f331db8136c8bf28ceea7f8ae410eb9d83225ad.zip | |
package_rpm.bbclass: no need to specify the magic file location
It's handled by the rpm wrapper command, created in rpm recipe.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 27a2bb479a..9b634e583b 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -693,7 +693,6 @@ python do_package_rpm () { d.setVar('RPM_PKGWRITEDIR', pkgwritedir) bb.debug(1, 'PKGWRITEDIR: %s' % d.getVar('RPM_PKGWRITEDIR')) pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}') - magicfile = d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc') bb.utils.mkdirhier(pkgwritedir) os.chmod(pkgwritedir, 0o755) @@ -711,7 +710,6 @@ python do_package_rpm () { cmd = cmd + " --define '__find_provides %{nil}'" cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" cmd = cmd + " --define 'debug_package %{nil}'" - cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'" cmd = cmd + " --define '_tmppath " + workdir + "'" if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" |