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-05-16 14:08:30 +0100 |
commit | 9cf8705ce2965a97a18c3c23ed66f8536c7c1612 (patch) | |
tree | ea8a1c6ccb369d81c5dede53fdb524f7dc1664bb /meta/classes/package_rpm.bbclass | |
parent | 6bf3ee8d72ca2de3d233e481cae869ca1c891fcd (diff) | |
download | poky-9cf8705ce2965a97a18c3c23ed66f8536c7c1612.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>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-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 084546f733..a844c4d436 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -643,6 +643,7 @@ python do_package_rpm () { | |||
643 | cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" | 643 | cmd = cmd + " --define '_builddir " + d.getVar('S') + "'" |
644 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" | 644 | cmd = cmd + " --define '_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'" |
645 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" | 645 | cmd = cmd + " --define '_use_internal_dependency_generator 0'" |
646 | cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" | ||
646 | if perfiledeps: | 647 | if perfiledeps: |
647 | cmd = cmd + " --define '__find_requires " + outdepends + "'" | 648 | cmd = cmd + " --define '__find_requires " + outdepends + "'" |
648 | cmd = cmd + " --define '__find_provides " + outprovides + "'" | 649 | cmd = cmd + " --define '__find_provides " + outprovides + "'" |