From: Ng Wei Tee <wei.tee.ng@intel.com>
Date: Fri, 5 May 2017 02:04:57 +0000 (-0700)
Subject: rpm: allow arch-dependent binaries in noarch packages
X-Git-Tag: uninative-1.7~864
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=6aaff392d703183d19192e2d171e10a92f259c65;p=openembedded-core.git

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>
---

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 + "'"