aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNg Wei Tee <wei.tee.ng@intel.com>2017-05-04 19:04:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-21 16:52:03 +0100
commit35059f271964da1f8112a45f19875b59fb9cd02f (patch)
tree0492dbd5a9da95a05a462bc7a9a179da56aadcec
parent92f73702d95e9c6ae72de667f225c9d24afe5c0a (diff)
downloadopenembedded-core-contrib-35059f271964da1f8112a45f19875b59fb9cd02f.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) 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>
-rw-r--r--meta/classes/package_rpm.bbclass1
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 () {
cmd = cmd + " --define '_builddir " + d.getVar('S') + "'"
cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'"
cmd = cmd + " --define '_use_internal_dependency_generator 0'"
+ cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'"
if perfiledeps:
cmd = cmd + " --define '__find_requires " + outdepends + "'"
cmd = cmd + " --define '__find_provides " + outprovides + "'"