diff options
-rw-r--r-- | tools/builder_common.sh | 18 | ||||
-rw-r--r-- | tools/builder_defaults.sh | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 3cabdbc..3bd5406 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -250,7 +250,6 @@ build_all_kernels() { continue fi - export SRC_CONF=${SRC_CONF} buildkernel echo ">>> Staging $BUILD_KERNEL kernel..." | tee -a ${LOGFILE} @@ -326,15 +325,8 @@ make_world() { return fi - # Set SRC_CONF variable if it's not already set. - if [ -z "${SRC_CONF}" ]; then - echo ">>> SRC_CONF is unset make sure this is what you want!" | tee -a ${LOGFILE} - else - echo ">>> Setting SRC_CONF to $SRC_CONF" | tee -a ${LOGFILE} - fi - # Set default parameters - export MAKE_ARGS="${MAKEJ_WORLD} SRCCONF=${SRC_CONF} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" + export MAKE_ARGS="${MAKEJ_WORLD} TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" echo ">>> LOGFILE set to $LOGFILE." | tee -a ${LOGFILE} makeargs="${MAKE_ARGS}" @@ -1683,12 +1675,10 @@ buildkernel() { export KERNCONF=$(basename ${KERNELCONF}) fi - SRCCONFBASENAME=$(basename ${SRC_CONF}) echo ">>> KERNCONFDIR: ${KERNCONFDIR}" - echo ">>> ARCH: ${TARGET}" - echo ">>> SRC_CONF: ${SRCCONFBASENAME}" + echo ">>> ARCH: ${TARGET_ARCH}" - makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" + makeargs="${MAKEJ_KERNEL} 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 +1696,7 @@ installkernel() { fi mkdir -p ${STAGE_CHROOT_DIR}/boot - makeargs="${MAKEJ_KERNEL} SRCCONF=${SRC_CONF} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DESTDIR=${KERNEL_DESTDIR}" + makeargs="${MAKEJ_KERNEL} 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 diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index 909f743..6e96e1b 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -159,7 +159,7 @@ case "${FREEBSD_REPO_BASE}" in esac # Leave this alone. -export SRC_CONF=${SRC_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_src.conf"} +export SRCCONF=${SRCCONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_src.conf"} export SRC_ENV_CONF=${SRC_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_src-env.conf"} export __MAKE_CONF=${__MAKE_CONF:-"${FREEBSD_SRC_DIR}/release/conf/${PRODUCT_NAME}_make.conf"} |