summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package_rpm.bbclass4
-rw-r--r--meta/conf/bitbake.conf4
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 1c62d82..e738806 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -684,8 +684,8 @@ python do_package_rpm () {
684 cmd = cmd + " --define '_use_internal_dependency_generator 0'" 684 cmd = cmd + " --define '_use_internal_dependency_generator 0'"
685 cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'" 685 cmd = cmd + " --define '_binaries_in_noarch_packages_terminate_build 0'"
686 cmd = cmd + " --define '_build_id_links none'" 686 cmd = cmd + " --define '_build_id_links none'"
687 cmd = cmd + " --define '_binary_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS")) 687 cmd = cmd + " --define '_binary_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS"))
688 cmd = cmd + " --define '_source_payload w6T%d.xzdio'" % int(d.getVar("XZ_THREADS")) 688 cmd = cmd + " --define '_source_payload w19T%d.zstdio'" % int(d.getVar("ZSTD_THREADS"))
689 cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" 689 cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'"
690 cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" 690 cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'"
691 cmd = cmd + " --define '_buildhost reproducible'" 691 cmd = cmd + " --define '_buildhost reproducible'"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f3ff5b7..030d29b 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -816,6 +816,10 @@ XZ_THREADS[vardepvalue] = "1"
816XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" 816XZ_DEFAULTS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}"
817XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" 817XZ_DEFAULTS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS"
818 818
819# Default parallelism for zstd
820ZSTD_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}"
821ZSTD_THREADS[vardepvalue] = "1"
822
819# Limit the number of threads that OpenMP libraries will use. Otherwise they 823# Limit the number of threads that OpenMP libraries will use. Otherwise they
820# may fallback to using all CPUs 824# may fallback to using all CPUs
821export OMP_NUM_THREADS = "${BB_NUMBER_THREADS}" 825export OMP_NUM_THREADS = "${BB_NUMBER_THREADS}"