summaryrefslogtreecommitdiffstats
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-05-16 14:08:19 +0100
commit6aaff392d703183d19192e2d171e10a92f259c65 (patch)
treeeecb4fbacca6581d1cdc0d232a1b9509cedd0f0c
parente16c5b5bc78b779ffd1eb07be1939aff300f3669 (diff)
downloadopenembedded-core-contrib-6aaff392d703183d19192e2d171e10a92f259c65.tar.gz
openembedded-core-contrib-6aaff392d703183d19192e2d171e10a92f259c65.tar.bz2
openembedded-core-contrib-6aaff392d703183d19192e2d171e10a92f259c65.zip
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] Signed-off-by: Ng Wei Tee <wei.tee.ng@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.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 084546f733..a844c4d436 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -643,6 +643,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 + "'"