From 2691f9aa0d9e4ee8faec5b5fc35a136fbecc8fac Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 26 May 2021 15:59:10 +0100 Subject: [PATCH] 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. (From OE-Core rev: b1e9fe67a85be516a0b32e0c91448df87a756e02) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit b9c983eb22a9b0771a0454216d1d7cbb5f3f8a16) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 7de409197e..fc9007922a 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'"