Remove unnecessary code and select default kernel for installation media

1 files changed, 14 insertions, 18 deletions

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 994c923..1daf7a4 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -145,21 +145,14 @@ build_all_kernels() {
 	for BUILD_KERNEL in $BUILD_KERNELS; do
 		unset KERNCONF
 		unset KERNEL_DESTDIR
-		unset KERNELCONF
 		unset KERNEL_NAME
 		export KERNCONF=$BUILD_KERNEL
 		export KERNEL_DESTDIR="$KERNEL_BUILD_PATH/$BUILD_KERNEL"
-		export KERNELCONF="${FREEBSD_SRC_DIR}/sys/${TARGET}/conf/$BUILD_KERNEL"
 		export KERNEL_NAME=${BUILD_KERNEL}
 
 		LOGFILE="${BUILDER_LOGS}/kernel.${KERNCONF}.${TARGET}.log"
 		echo ">>> Building $BUILD_KERNEL kernel."  | tee -a ${LOGFILE}
 
-		if [ ! -e "${KERNELCONF}" ]; then
-			echo ">>> ERROR: Could not find $KERNELCONF"
-			print_error_pfS
-		fi
-
 		if [ -n "${NO_BUILDKERNEL}" -a -f "${CORE_PKG_ALL_PATH}/$(get_pkg_name kernel-${KERNEL_NAME}).txz" ]; then
 			echo ">>> NO_BUILDKERNEL set, skipping build" | tee -a ${LOGFILE}
 			continue
@@ -1505,47 +1498,50 @@ staginareas_clean_each_run() {
 
 # Imported from FreeSBIE
 buildkernel() {
+	local _kernconf=${1:-${KERNCONF}}
+
 	if [ -n "${NO_BUILDKERNEL}" ]; then
 		echo ">>> NO_BUILDKERNEL set, skipping build" | tee -a ${LOGFILE}
 		return
 	fi
 
-	if [ -z "${KERNCONF}" ]; then
+	if [ -z "${_kernconf}" ]; then
 		echo ">>> ERROR: No kernel configuration defined probably this is not what you want! STOPPING!" | tee -a ${LOGFILE}
 		print_error_pfS
 	fi
 
-	if [ -n "${KERNELCONF}" ]; then
-		export KERNCONFDIR=$(dirname ${KERNELCONF})
-		export KERNCONF=$(basename ${KERNELCONF})
-	fi
+	local _old_kernconf=${KERNCONF}
+	export KERNCONF=${_kernconf}
 
 	echo ">>> $(LC_ALL=C date) - Starting build kernel for ${TARGET} architecture..." | tee -a ${LOGFILE}
 	script -aq $LOGFILE ${BUILDER_SCRIPTS}/build_freebsd.sh -W -s ${FREEBSD_SRC_DIR} \
 		|| print_error_pfS
 	echo ">>> $(LC_ALL=C date) - Finished build kernel for ${TARGET} architecture..." | tee -a ${LOGFILE}
+
+	export KERNCONF=${_old_kernconf}
 }
 
 # Imported from FreeSBIE
 installkernel() {
 	local _destdir=${1:-${KERNEL_DESTDIR}}
+	local _kernconf=${2:-${KERNCONF}}
 
-	if [ -z "${KERNCONF}" ]; then
+	if [ -z "${_kernconf}" ]; then
 		echo ">>> ERROR: No kernel configuration defined probably this is not what you want! STOPPING!" | tee -a ${LOGFILE}
 		print_error_pfS
 	fi
 
-	if [ -n "${KERNELCONF}" ]; then
-		export KERNCONFDIR=$(dirname ${KERNELCONF})
-		export KERNCONF=$(basename ${KERNELCONF})
-	fi
+	local _old_kernconf=${KERNCONF}
+	export KERNCONF=${_kernconf}
 
 	mkdir -p ${STAGE_CHROOT_DIR}/boot
-	echo ">>> Installing kernel (${KERNCONF}) for ${TARGET} architecture..." | tee -a ${LOGFILE}
+	echo ">>> Installing kernel (${_kernconf}) for ${TARGET} architecture..." | tee -a ${LOGFILE}
 	script -aq $LOGFILE ${BUILDER_SCRIPTS}/install_freebsd.sh -W -D -z \
 		-s ${FREEBSD_SRC_DIR} \
 		-d ${_destdir} \
 		|| print_error_pfS
+
+	export KERNCONF=${_old_kernconf}
 }
 
 # Launch is ran first to setup a few variables that we need