From nobody Mon Dec 16 15:15:19 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 4YBk5h251Zz5hYVq; Mon, 16 Dec 2024 15:15:20 +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 4YBk5h0NzJz48N1; Mon, 16 Dec 2024 15:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362120; 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=S0+inPWOKugj+6vkJgJNQr7u2h3BIJGZuhns0VMz93g=; b=FSGqShaQwTvXsO1rLffAz8I4ZZif6QJsNWRupZTdzKkKVsrB9mFhAmeMuCet6v7Wm5u26t ouJ/G9tayYFJ3fUrjGjWRa8W0u9On8IAZOfaNsdtjwaDqWVIMSqdsagWTU79Ibo9bECZuZ wKsa3YyIqTq1jSsqyRS+k5/UiQqBO5LOl7xjf3XA/qHMWlV4uzaw90cxHIzVa8HOwgWGyq +y0GzZ4CunNX9nAar1xSOsApeaDVWSSaOU20bl9qYMyM/5lSHwJNcoOparzYz0faJRHItO X94IbHsypfO3B7P8zcEIgvw+7wSQf8SJHu0veI1BRWHyOoo9WhehO7EM6PBCgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362120; 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=S0+inPWOKugj+6vkJgJNQr7u2h3BIJGZuhns0VMz93g=; b=qPRX8HEsozlibCHjDSB5gmU3FqVHPaSSTUmqVaCaxolTSBar5b0FYz7hRMd7NCKkXMUqjX OCqr7q8cvCwS5QkEo8K37xpSbHEtxSvEy/3LfDXHBLP35UwDXW/2a+dgTxSZZNvsvIIaE4 +qhqCyKR6Ifl1ZqkwEnZjrVGNteOMCsLt7teTqJS6zaHa4S20ER9u1eY0rnn4rdst5qgSd FkQGQsfUvbKgcLeiovIXzDED0DrOiTl+UUD1Vi+jNlm+/4HdVw/yP9MJXDBfKyf4F4XQ0i XmdJQL5z7J0DFokz20XdKtsDyVczJjjm8+W0PuPCu+q+y8nXvNIYFoAHFVz+gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734362120; a=rsa-sha256; cv=none; b=l8KXl7RalCQodOvWz+r3/WDNKU4RgTf+VBvnXlI1Xd7PYRrFoxdb3xzuCVf4k0RQJAF5L0 GkcX0untscRLHXHGFQH6fOkK4DEaeXnjqnnb81Vvsr8x3OQHOGqWkmZVqOLDPacoW7EsLH 43+szjYQH0+yl8UmuVL1blygIsdWg8q1Kl3jstNXvtFcdkviTHi+ckBmLl91YPhGCjKKjV d65xzTDGervo/RPlPAH/wedZNMqJ9wB06YhFQtTKJ4xhr7pT6ptMsXH/QtwK4l4+9bVBXf PZBwHQf/hm5pIGPMnA3uRR/tInTXNEGKvytcjXic6/3Noe8z1dkT6vwao6WOZg== 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 4YBk5h00myzyZT; Mon, 16 Dec 2024 15:15:20 +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 4BGFFJP6011862; Mon, 16 Dec 2024 15:15:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGFFJaB011859; Mon, 16 Dec 2024 15:15:19 GMT (envelope-from git) Date: Mon, 16 Dec 2024 15:15:19 GMT Message-Id: <202412161515.4BGFFJaB011859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 16fc83629869 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 16fc8362986908ed125f4f451fdbf3a37e30b3de Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=16fc8362986908ed125f4f451fdbf3a37e30b3de commit 16fc8362986908ed125f4f451fdbf3a37e30b3de Author: Jose Luis Duran AuthorDate: 2024-11-07 14:32:01 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-16 15:13:12 +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 (cherry picked from commit 3c5d19a40de7273bb478163639dd8532af425595) --- 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 065788133ff5..d5d357d9ad19 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