From nobody Sat Nov 16 07:23:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xr53N6TcFz5cyR6; Sat, 16 Nov 2024 07:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xr53N44hJz4g1X; Sat, 16 Nov 2024 07:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731741824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plKzGWwdOwMCLwwi5bR0O/9v/7IcrMCvjf07/5cPrUQ=; b=KEO0HQxtl2h9XI1Udq2gyl4wOSHjjbhx9+1xEInGuGIJ1LKX6z90UVKWM0ZZNPYCtJNQba ZPtXIVHPv9f+GnTUGZHPZ0wRWyVZGRppx1P4KnxazIf5ZUSjmBZC1AZZsVPL5WWM22a1Pq r4+VkTczDEmSyedYyJpOkhjmvxstzpMDHGrWWqHoNE+PtuWQP1zYMI13tKXmeq4XydrJXv XZ1J9tLk0pLArBZ+NKPFb5a1dkRZpNh8c55bq0RvvIL7H2Rjym2UrcJemBrWXWUtcw4cKh ByYTLcHMsK9+ofVz4zTN4y/VcJyomq+IyirRJt74Bw+5OcBhelKQnbtCUG9C7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731741824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plKzGWwdOwMCLwwi5bR0O/9v/7IcrMCvjf07/5cPrUQ=; b=cV4xh5aLxP7XjVjX02TD8idPCQj6h7B24dztmhsLiCzd4Lw2DCdwwRrzcCg8E5SXFOtFR/ agOhWcEdn7HjvQJkfFjFvV5qDqXn/OCM6auhPP5pFEzLkAjF4pV2wb6NHyc0Dy+DzBTMeU ZjMJCCScYVS01xhy7r26Vb47m95i8uO+B35kilavpyFJjDZbVRSwgZ4COP5KFGfx47p6RY j1wfJwWepcPDL1qWGS62uuHvYgKw6DtQRRO/zZv67AWQd76u7mNxQfHDC7q3gohjLqPmni Y6NbOKtDV1WxKrHtXLM0dM8rX9d326HAyrSzxRHngdpH4x74f3Jq3JANNPKeoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731741824; a=rsa-sha256; cv=none; b=yWb9vKUDoOhIqAleH6VC655r9sZfB1AzBDuNIgVA/gT8KiNH62kFxdvKSKYcLxmoE9xcTF VqoPR9Fq18HQPXr6Yc2yLhVnG5u007oMFmtlwPOiNxb4QPAE2LHz23HvexvaSqcM2DF3IN 2GMqkW4UDn0mYDv1lKMQtN4X3Qo8l0XruF/UM8jsu/oD17il9uBBEZUcC0pY65/bnjJ8Cu CPPZH+hwQwY+lX9S+hl8AohP3IdZG1FZJNMi8aQk3IAs7lsjvyp79tRDY83qZakAkkWtMc /ajKNgxo6eK34tI3t0Yj4t+POGrwWO1spG3DHI9n6jTHaKLlHBXM1/zHdv4vYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xr53N2q3ZzxbW; Sat, 16 Nov 2024 07:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AG7NiLC018343; Sat, 16 Nov 2024 07:23:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AG7NiKp018340; Sat, 16 Nov 2024 07:23:44 GMT (envelope-from git) Date: Sat, 16 Nov 2024 07:23:44 GMT Message-Id: <202411160723.4AG7NiKp018340@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 3c5d19a40de7 - main - nanobsd: Fix parallel make List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c5d19a40de7273bb478163639dd8532af425595 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=3c5d19a40de7273bb478163639dd8532af425595 commit 3c5d19a40de7273bb478163639dd8532af425595 Author: Jose Luis Duran AuthorDate: 2024-11-07 14:32:01 +0000 Commit: Jose Luis Duran CommitDate: 2024-11-16 06:55:25 +0000 nanobsd: Fix parallel make The NANO_NCPU (number of CPUs) value gets ignored by the build script when setting the NANO_PMAKE (parallel make) value. Fix it by setting the NANO_PMAKE later in the process. PR: 277269 Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47476 --- tools/tools/nanobsd/defaults.sh | 5 ++++- tools/tools/nanobsd/nanobsd.sh | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 54e10ba74550..910ec69865df 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -67,7 +67,6 @@ NANO_PKG_META_BASE=/var/db # Make & parallel Make NANO_MAKE="make" NANO_NCPU=$(sysctl -n hw.ncpu) -NANO_PMAKE="make -j $NANO_NCPU" # The default name for any image we create. NANO_IMGNAME="_.disk.full" @@ -892,6 +891,10 @@ set_defaults_and_export ( ) { : ${NANO_DISKIMGDIR:=${NANO_OBJ}} : ${NANO_WORLDDIR:=${NANO_OBJ}/_.w} : ${NANO_LOG:=${NANO_OBJ}} + : ${NANO_PMAKE:="${NANO_MAKE} -j ${NANO_NCPU}"} + if ! $do_clean; then + NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN" + fi NANO_MAKE_CONF_BUILD=${MAKEOBJDIRPREFIX}/make.conf.build NANO_MAKE_CONF_INSTALL=${NANO_OBJ}/make.conf.install diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh index af03d89acece..4c390d8ca371 100755 --- a/tools/tools/nanobsd/nanobsd.sh +++ b/tools/tools/nanobsd/nanobsd.sh @@ -156,10 +156,6 @@ if [ ! -d "${NANO_TOOLS}" ]; then exit 1 fi -if ! $do_clean; then - NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN" -fi - pprint 1 "NanoBSD image ${NANO_NAME} build starting" run_early_customize