aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-05-26 15:59:10 +0100
committerSteve Sakoman <steve@sakoman.com>2021-05-28 14:22:21 -1000
commitb1e9fe67a85be516a0b32e0c91448df87a756e02 (patch)
treecfdbc0dfbf7a6f57e3759958e4b34c5d685f4676
parent09b9027a9da8b5cf34e1f1c016d9d6bbbe904dcf (diff)
downloadopenembedded-core-contrib-b1e9fe67a85be516a0b32e0c91448df87a756e02.tar.gz
openembedded-core-contrib-b1e9fe67a85be516a0b32e0c91448df87a756e02.tar.bz2
openembedded-core-contrib-b1e9fe67a85be516a0b32e0c91448df87a756e02.zip
package_rpm: pass XZ_THREADS to rpm
By default RPM uses the number of cores as the number of threads to use, which can result in quite antisocial memory usage. As we control the macros for compression anyway, we can pass XZ_THREADS to limit the number of threads if needed. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit b9c983eb22a9b0771a0454216d1d7cbb5f3f8a16) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes/package_rpm.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 7de409197ee..fc9007922a2 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -678,8 +678,8 @@ python do_package_rpm () {
cmd = cmd + " --define '_use_internal_dependency_generator 0'"
cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'"
cmd = cmd + " --define '_build_id_links none'"
- cmd = cmd + " --define '_binary_payload w6T.xzdio'"
- cmd = cmd + " --define '_source_payload w6T.xzdio'"
+ cmd = cmd + " --define '_binary_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS"))
+ cmd = cmd + " --define '_source_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS"))
cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'"
cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'"
cmd = cmd + " --define '_buildhost reproducible'"