summaryrefslogtreecommitdiffstats
path: root/tools/builder_common.sh
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-06-27 12:49:17 -0300
committerRenato Botelho <renato@netgate.com>2016-06-27 12:50:15 -0300
commit8093ae170b37fbe4f7e603075b364beed60fc7ff (patch)
tree726af46551f3b68a5695f7b2e52475da7f63f152 /tools/builder_common.sh
parent697cd601aa4e936d1ac814f88c17520cea9477db (diff)
downloadpfsense-8093ae170b37fbe4f7e603075b364beed60fc7ff.zip
pfsense-8093ae170b37fbe4f7e603075b364beed60fc7ff.tar.gz
Export SRCCONF, 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.sh18
1 files changed, 4 insertions, 14 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
OpenPOWER on IntegriCloud