diff options
author | Ng Wei Tee <wei.tee.ng@intel.com> | 2017-05-04 19:04:57 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-21 16:55:57 +0100 |
commit | f6eff907375b17c8c01dfa34bb23282088b9b319 (patch) | |
tree | cf83152a1cf824d03858e6c48ed273a09dbb6c72 /meta | |
parent | b5bef4ea31ee09f053e519e76d20cad1e2ccba18 (diff) | |
download | poky-f6eff907375b17c8c01dfa34bb23282088b9b319.tar.gz |
rpm: allow arch-dependent binaries in noarch packages
This is needed for packages like linux-firmware which have a
legitimate reason for it. Oe-core has a separate package_qa
test for this situation, so any accidental inclusions of such
binaries will still be caught.
[YOCTO #11329]
(From OE-Core rev: 6aaff392d703183d19192e2d171e10a92f259c65)
(From OE-Core rev: 35059f271964da1f8112a45f19875b59fb9cd02f)
Signed-off-by: Ng Wei Tee <wei.tee.ng@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package_rpm.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 62324b30a0..9ec2d3c0f5 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -664,6 +664,7 @@ python do_package_rpm () { | |||
664 | cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" | 664 | cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" |
665 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" | 665 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" |
666 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" | 666 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" |
667 | cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" | ||
667 | if perfiledeps: | 668 | if perfiledeps: |
668 | cmd = cmd + " --define '__find_requires " + outdepends + "'" | 669 | cmd = cmd + " --define '__find_requires " + outdepends + "'" |
669 | cmd = cmd + " --define '__find_provides " + outprovides + "'" | 670 | cmd = cmd + " --define '__find_provides " + outprovides + "'" |