From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6834007135866585088 X-Received: by 2002:a7b:c0d9:: with SMTP id s25mr7712306wmh.175.1591166280207; Tue, 02 Jun 2020 23:38:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:db45:: with SMTP id f5ls1398835wrj.0.gmail; Tue, 02 Jun 2020 23:37:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdiaYDIWIeOguKO30nzJH6iGQYq7Hjg6DS1kdT6ErH5H6LMWZlKxZLAYCx47lKZjA2P0Yh X-Received: by 2002:adf:de84:: with SMTP id w4mr30053268wrl.54.1591166279502; Tue, 02 Jun 2020 23:37:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591166279; cv=none; d=google.com; s=arc-20160816; b=y7tsjWYzfmmQ0Dwi5fRgvhprbIDj5YOriPy0hyit7VCYXDID9JjUWc58Yaox75FfSL crt4L68iwDbYFE52CYQgQMXs3sGazPpC/Ygtr1opk6UsMZ5NSsjtc+28KAXVMTXDEY1w eYTwlS82mFRMHd/kVwg+iu7ZrEta+GLwMlO4QEXdpByA0+MSPyxM61f5jI+ApJr50PCN radu2sCj9sN/RSEVWt5vy2qR689AcNzj1C24uHs933fJgXcaUFUSLulGwNwtCczFYOMv I0pTqO80OIBuJ6F4UtjHJo57V/7EFQXJUNRO9bC45V8GPxWDbB6l5tZlN4ZcrZk2slc8 VE4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:to:subject:from; bh=jAN5/y6YuqoZWpi5qrYDSlEIexMdFlpRonB4dq4d+Rc=; b=fauk0qHg4EhuuaSsFRSLXs1tKrFc4ffiJ2LbDR0BvScLg5oOtOPyKshR7EQ+bWsV8v 3kTp+HplKS9V1ZPsmBTYUS0w2U0XTtJLVed06C+p12CPn68YXSPLTaiDMcGZ5yPRdMbH 3Y4+yo7sL19WggagWxjeTuOyCU2zWe9W8qr3jyYCH/WyZnJivVlQTosRikeN74LVlkkz 12mbWqSWbvs2pDdbE8md6mAshH5SbkwYDpuwsOawS0BJ24kaEfcVdMz3zEN9Vmr0/D6U 5ExnTZEu2lq+WivanZOKAGD3kdnU6WOD0w+3NrFNigklHb/0k7msb6IqMktg4OBMf3ml 7gXw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id f16si68883wrq.5.2020.06.02.23.37.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 23:37:59 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 0536bwa0021612 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 3 Jun 2020 08:37:59 +0200 Received: from [167.87.5.91] ([167.87.5.91]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0536bvY3029536 for ; Wed, 3 Jun 2020 08:37:58 +0200 From: Jan Kiszka Subject: [PATCH] Consolidate over PARALLEL_MAKE To: isar-users Message-ID: Date: Wed, 3 Jun 2020 08:37:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 0nuPRKIMxbZ/ From: Jan Kiszka Replace self-invented / open-coded parallel build rules over the OE pattern PARALLEL_MAKE. Should specifically reduce the spread of PARALLEL_BUILD definitions in downstream layers. Mea culpa. Signed-off-by: Jan Kiszka --- meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules | 5 ++--- meta/classes/dpkg.bbclass | 1 + meta/conf/bitbake.conf | 4 ++++ meta/recipes-bsp/u-boot/files/debian/rules | 8 +++----- meta/recipes-kernel/linux/files/debian/isar/build.tmpl | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules b/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules index c8feb715..c3fc50a9 100644 --- a/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules +++ b/meta-isar/recipes-bsp/opensbi/files/sifive-fu540-rules @@ -4,10 +4,9 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- endif -PARALLEL_BUILD=-j $(shell echo $$(($$(nproc) * 2))) - override_dh_auto_build: - CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_BUILD) PLATFORM=sifive/fu540 FW_PAYLOAD_PATH=/usr/lib/u-boot/sifive_fu540/u-boot.bin + CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=sifive/fu540 \ + FW_PAYLOAD_PATH=/usr/lib/u-boot/sifive_fu540/u-boot.bin %: dh $@ diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 585365ee..acccc1f2 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -25,6 +25,7 @@ addtask devshell after do_install_builddeps # Build package from sources using build script dpkg_runbuild() { E="${@ isar_export_proxies(d)}" + export PARALLEL_MAKE="${PARALLEL_MAKE}" sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ /isar/build.sh ${PP}/${PPS} ${DISTRO_ARCH} } diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 848e085a..0e0c79e0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -101,8 +101,12 @@ BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ BB_SIGNATURE_HANDLER ?= "basichash" BB_STAMP_POLICY ?= "full" +# Default to setting automatically based on cpu count BB_NUMBER_THREADS ?= "${@bb.utils.cpu_count()}" +# Default to setting automatically based on cpu count +PARALLEL_MAKE ?= "-j ${@bb.utils.cpu_count()}" + BBINCLUDELOGS ??= "yes" # Add event handlers for bitbake diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules index 3f7a3218..92c07b17 100755 --- a/meta/recipes-bsp/u-boot/files/debian/rules +++ b/meta/recipes-bsp/u-boot/files/debian/rules @@ -12,12 +12,10 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- SET_CROSS_BUILD_TOOLS=CROSS_BUILD_TOOLS=y endif -PARALLEL_BUILD=-j $(shell echo $$(($$(nproc) * 2))) - override_dh_auto_build: - $(MAKE) $(PARALLEL_BUILD) $(U_BOOT_CONFIG) - $(MAKE) $(PARALLEL_BUILD) ${U_BOOT_BIN} - $(MAKE) $(PARALLEL_BUILD) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools + $(MAKE) $(PARALLEL_MAKE) $(U_BOOT_CONFIG) + $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_BIN} + $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools override_dh_auto_install: mv tools/env/lib.a tools/env/libubootenv.a diff --git a/meta/recipes-kernel/linux/files/debian/isar/build.tmpl b/meta/recipes-kernel/linux/files/debian/isar/build.tmpl index 17983e4d..b7749cec 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/build.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/build.tmpl @@ -22,7 +22,7 @@ do_build() { set -x # Build the Linux kernel - ${MAKE} O=${KERNEL_BUILD_DIR} -j $(nproc) || exit ${?} + ${MAKE} O=${KERNEL_BUILD_DIR} ${PARALLEL_MAKE} || exit ${?} # Stop tracing set +x -- 2.26.2