upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-19 02:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

nanobsd: Fix parallel make

Browse source 
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)
This commit is contained in:
Jose Luis Duran 2024-11-07 14:32:01 +00:00
parent 3e93a090b5
commit 67dd41cdb1
No known key found for this signature in database
GPG key ID: 5415E244477475CC
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/tools/nanobsd/defaults.sh
View file

@ -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

4
tools/tools/nanobsd/nanobsd.sh
View file

@ -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