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-14 14:42:17 +0000 |
commit | dfa298762350289772ef6841d8660912ad00a245 (patch) | |
tree | a6ccb6d6e854e778b90311f170fb18242ef53ffb /meta/classes | |
parent | 5445f0397520d537d2a8f326869aa7436ea177b6 (diff) | |
download | poky-dfa298762350289772ef6841d8660912ad00a245.tar.gz |
package_rpm.bbclass: no need to specify the magic file location
It's handled by the rpm wrapper command, created in rpm recipe.
(From OE-Core rev: 8f331db8136c8bf28ceea7f8ae410eb9d83225ad)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 () { | |||
693 | d.setVar('RPM_PKGWRITEDIR', pkgwritedir) | 693 | d.setVar('RPM_PKGWRITEDIR', pkgwritedir) |
694 | bb.debug(1, 'PKGWRITEDIR: %s' % d.getVar('RPM_PKGWRITEDIR')) | 694 | bb.debug(1, 'PKGWRITEDIR: %s' % d.getVar('RPM_PKGWRITEDIR')) |
695 | pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}') | 695 | pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}') |
696 | magicfile = d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc') | ||
697 | bb.utils.mkdirhier(pkgwritedir) | 696 | bb.utils.mkdirhier(pkgwritedir) |
698 | os.chmod(pkgwritedir, 0o755) | 697 | os.chmod(pkgwritedir, 0o755) |
699 | 698 | ||
@@ -711,7 +710,6 @@ python do_package_rpm () { | |||
711 | cmd = cmd + " --define '__find_provides %{nil}'" | 710 | cmd = cmd + " --define '__find_provides %{nil}'" |
712 | cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" | 711 | cmd = cmd + " --define '_unpackaged_files_terminate_build 0'" |
713 | cmd = cmd + " --define 'debug_package %{nil}'" | 712 | cmd = cmd + " --define 'debug_package %{nil}'" |
714 | cmd = cmd + " --define '_rpmfc_magic_path " + magicfile + "'" | ||
715 | cmd = cmd + " --define '_tmppath " + workdir + "'" | 713 | cmd = cmd + " --define '_tmppath " + workdir + "'" |
716 | if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): | 714 | if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): |
717 | cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" | 715 | cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" |