diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-27 12:47:24 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-27 12:50:08 -0300 |
| commit | 697cd601aa4e936d1ac814f88c17520cea9477db (patch) | |
| tree | a2cbaf64d7e9e7a774690cd2306ed5516eb33ed4 /tools/builder_common.sh | |
| parent | b906e9c27bf1f19d4e73aebb67b0d54f9cb7eeab (diff) | |
| download | pfsense-697cd601aa4e936d1ac814f88c17520cea9477db.zip pfsense-697cd601aa4e936d1ac814f88c17520cea9477db.tar.gz | |
Export __MAKE_CONF, variable name used by FreeBSD and stop adding it to build commands
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index be31093..3cabdbc 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -334,7 +334,7 @@ make_world() { fi # Set default parameters - export MAKE_ARGS="${MAKEJ_WORLD} __MAKE_CONF=${MAKE_CONF} SRCCONF=${SRC_CONF} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" + export MAKE_ARGS="${MAKEJ_WORLD} SRCCONF=${SRC_CONF} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" echo ">>> LOGFILE set to $LOGFILE." | tee -a ${LOGFILE} makeargs="${MAKE_ARGS}" @@ -1688,7 +1688,7 @@ buildkernel() { echo ">>> ARCH: ${TARGET}" echo ">>> SRC_CONF: ${SRCCONFBASENAME}" - makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" + makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" echo ">>> Builder is running the command: script -aq $LOGFILE make -DNO_KERNELCLEAN $makeargs buildkernel KERNCONF=${KERNCONF}" | tee -a $LOGFILE (script -q $LOGFILE make -C ${FREEBSD_SRC_DIR} -DNO_KERNELCLEAN $makeargs buildkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>' } @@ -1706,7 +1706,7 @@ installkernel() { fi mkdir -p ${STAGE_CHROOT_DIR}/boot - makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} __MAKE_CONF=${MAKE_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}" + makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}" echo ">>> Builder is running the command: script -aq $LOGFILE make ${makeargs} installkernel KERNCONF=${KERNCONF}" | tee -a $LOGFILE (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installkernel KERNCONF=${KERNCONF} || print_error_pfS;) | egrep '^>>>' gzip -f9 $KERNEL_DESTDIR/boot/kernel/kernel |
