From 3c794eb6dfb7ce172ddcd4b5acdfabd660a29ffb Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Mon, 27 Jun 2016 12:58:54 -0300 Subject: Export LOCAL_ITOOLS, same variable used by FreeBSD build tools --- tools/builder_common.sh | 8 ++++---- tools/builder_defaults.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/builder_common.sh b/tools/builder_common.sh index f2d9b7c..1ece80c 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -331,8 +331,8 @@ make_world() { echo ">>> LOGFILE set to $LOGFILE." | tee -a ${LOGFILE} makeargs="${MAKE_ARGS}" echo ">>> Building world for ${TARGET} architecture... (Starting - $(LC_ALL=C date))" | tee -a ${LOGFILE} - echo ">>> Builder is running the command: env LOCAL_ITOOLS=\"${EXTRA_TOOLS}\" script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld" | tee -a ${LOGFILE} - (env LOCAL_ITOOLS="${EXTRA_TOOLS}" script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} + echo ">>> Builder is running the command: script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld" | tee -a ${LOGFILE} + (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} echo ">>> Building world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} LOGFILE=${BUILDER_LOGS}/installworld.${TARGET} @@ -340,8 +340,8 @@ make_world() { # Create if cleaned up makeargs="${MAKE_ARGS} DESTDIR=${STAGE_CHROOT_DIR} WITHOUT_TOOLCHAIN=1" echo ">>> Installing world for ${TARGET} architecture... (Starting - $(LC_ALL=C date))" | tee -a ${LOGFILE} - echo ">>> Builder is running the command: env LOCAL_ITOOLS=\"${EXTRA_TOOLS}\" script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld" | tee -a ${LOGFILE} - (env LOCAL_ITOOLS="${EXTRA_TOOLS}" script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} + echo ">>> Builder is running the command: script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld" | tee -a ${LOGFILE} + (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} echo ">>> Installing world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} makeargs="${MAKE_ARGS} DESTDIR=${STAGE_CHROOT_DIR}" diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 56a3345..60d6fcd 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -164,7 +164,7 @@ export SRC_ENV_CONF=${SRC_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME} export __MAKE_CONF=${__MAKE_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_make.conf"} # Extra tools to be added to ITOOLS -export EXTRA_TOOLS=${EXTRA_TOOLS:-"uuencode uudecode ex"} +export LOCAL_ITOOLS=${LOCAL_ITOOLS:-"uuencode uudecode ex"} # Path to kernel files being built export KERNEL_BUILD_PATH=${KERNEL_BUILD_PATH:-"${SCRATCHDIR}/kernels"} -- cgit v1.1