diff options
| author | Steve Wills <steve@mouf.net> | 2019-08-30 18:30:25 +0300 |
|---|---|---|
| committer | Steve Wills <steve@mouf.net> | 2019-08-30 18:30:25 +0300 |
| commit | 2a35637d5eeb8da723f0ae8a2d54d020e4ce03fe (patch) | |
| tree | 9417c05b59bdb391ab7444a9bc357aa3caa5aa19 /src | |
| parent | 122329edcb34510929085c14d3359c8f7f78f128 (diff) | |
Pass MAKEWORLDARGS during installworld too
both for consistency and for passing things like LOCAL_MODULES
Diffstat (limited to 'src')
| -rwxr-xr-x | src/share/poudriere/jail.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/share/poudriere/jail.sh b/src/share/poudriere/jail.sh index 438a18c6..4dafd48d 100755 --- a/src/share/poudriere/jail.sh +++ b/src/share/poudriere/jail.sh @@ -361,17 +361,17 @@ installworld() { msg "Starting make installworld" ${MAKE_CMD} -C "${SRC_BASE}" ${make_jobs} installworld \ - DESTDIR=${destdir} DB_FROM_SRC=1 || \ + DESTDIR=${destdir} DB_FROM_SRC=1 ${MAKEWORLDARGS} || \ err 1 "Failed to 'make installworld'" ${MAKE_CMD} -C "${SRC_BASE}" ${make_jobs} DESTDIR=${destdir} \ - DB_FROM_SRC=1 distrib-dirs || \ + DB_FROM_SRC=1 distrib-dirs ${MAKEWORLDARGS} || \ err 1 "Failed to 'make distrib-dirs'" ${MAKE_CMD} -C "${SRC_BASE}" ${make_jobs} DESTDIR=${destdir} \ - distribution || err 1 "Failed to 'make distribution'" + distribution ${MAKEWORLDARGS} || err 1 "Failed to 'make distribution'" if [ -n "${KERNEL}" ]; then msg "Starting make installkernel" ${MAKE_CMD} -C "${SRC_BASE}" ${make_jobs} installkernel \ - KERNCONF=${KERNEL} DESTDIR=${destdir} || \ + KERNCONF=${KERNEL} DESTDIR=${destdir} ${MAKEWORLDARGS} || \ err 1 "Failed to 'make installkernel'" fi |