From nobody Mon Dec 16 15:14:37 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 4YBk4s5MQ2z5hY4q; Mon, 16 Dec 2024 15:14:37 +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 4YBk4s4xGLz46B5; Mon, 16 Dec 2024 15:14:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362077; 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=cllxg8DXXI6Ku9Mf3uOcbL8cTyuKZltHymLVyFmNdjE=; b=Qc+wiwDLbFVGrkHRlMnRzwFx5wcwCWIAoxIPCci9QD9k/mWZYmna//tYF9dAvWchWJl+FJ jV8rJ/Xl/nKuCKezMWn9asLM+ZpnXYN9xZWS1A14HU+V1jzn5kiOFaYKG5gKnJaL8WjXas KH6HXrad16vMIBxC3sBZV4VI8+h0lfZyH3Ujkj/oIb/+G36KXaGz4RlA0lRxGKf/nwMAXm aoS68gSeOykIXigfzJSa+SvRSTE1hDyK7xRTFZKCy/kq3WmzJ8Lk1zwxC4lMIeZ5BNh1kv zfEVX7AITYWxJK6VfeNyigQimOUuOasEm5FgLsmjZ2m5oCM8e3cviHzmhcSDaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362077; 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=cllxg8DXXI6Ku9Mf3uOcbL8cTyuKZltHymLVyFmNdjE=; b=Eu9/I7eGTXxHB6AXNvCK94i+z31t7ou/kASlbaCripM61fG2SNZLkT8i5VszYU/WwN4PlS qdCmM4EURGdoG07ufuSvzyQq4GMUkjlPha+nIk77YadlbG+xJMWw1/vNL8/ziDvT29wJ+8 LE9EzgVyykNTai68om4r1cEOyRH3Z7JswVvmsjJZw2dSHKy0ORMuoknmD9eO4yuS1G4ab2 1kMWZf1+cZzrr2ZHH99TCQkVBREX9zZcSvDLMsFDTD1ryVPpvqnJbbLk7SD/DY9EW9Wdc4 eR5NXjSC3CEg/v89D7lfwitvya26VBXPxyOLID0ewi/a5eV54dZuKGxAJrzE2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734362077; a=rsa-sha256; cv=none; b=GDpHOoLZM3BcgiyqsLrwHGnK5yksF5bArPWGudujQmc8lNUXgARyQ9EQ44J8kpFJK/y7jQ OG2u+em5msgLWEtxRLU0c4pTr36yT7t0sX1Lky+VUkDYjPJghna9orZg8+XITPmWYKTJ4n ZZt571G8Ihy7m+fvTxIf4l3x8ymU6Ha9d8iB772gfEch+RJQKdbHpCEiq1XozrY79soL1l S6ieOEnlpeymtfibxE2e9DUZvPxeB8YtrTqtdXe1mQPKvEoVWMvTgadzxc+3EfK8htZ81I SJAk6K+QxlqTXtsZpRHskVoSg826WYu/PioQFCIsPT8D/3WVNmjg+46f5NHboQ== 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 4YBk4s4XYJzyhy; Mon, 16 Dec 2024 15:14:37 +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 4BGFEboj011070; Mon, 16 Dec 2024 15:14:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGFEbbp011067; Mon, 16 Dec 2024 15:14:37 GMT (envelope-from git) Date: Mon, 16 Dec 2024 15:14:37 GMT Message-Id: <202412161514.4BGFEbbp011067@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: 67dd41cdb10d - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 67dd41cdb10dcdf113f29645ff2c10e00bd27770 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=67dd41cdb10dcdf113f29645ff2c10e00bd27770 commit 67dd41cdb10dcdf113f29645ff2c10e00bd27770 Author: Jose Luis Duran AuthorDate: 2024-11-07 14:32:01 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-16 15:11:31 +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 33111a9c401f..8ce3af149356 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