summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorthomas <thomas@FreeBSD.org>2014-05-12 19:11:39 +0000
committerthomas <thomas@FreeBSD.org>2014-05-12 19:11:39 +0000
commitb703d2f4a3671731abd23a7861fb85483fd790d2 (patch)
tree0c7cb7c3fc17dcdd7c410bdfd87571023523e90f /tools
parent2f29f665c9ba510d8c9d2fab818bfe63d74f0ba2 (diff)
downloadFreeBSD-src-b703d2f4a3671731abd23a7861fb85483fd790d2.zip
FreeBSD-src-b703d2f4a3671731abd23a7861fb85483fd790d2.tar.gz
(NANO_CONFIG): New variable containing path of config file, so that
the configuration can reference additional files relative to its own location. (NANO_MODULES): If set to "default", install all built modules. Reviewed by: imp MFC after: 1 week
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/nanobsd/nanobsd.sh15
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 274132c..600d112 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -79,7 +79,8 @@ CONF_WORLD=' '
# Kernel config file to use
NANO_KERNEL=GENERIC
-# Kernel modules to build; default is none
+# Kernel modules to install. If empty, no modules are installed.
+# Use "default" to install all built modules.
NANO_MODULES=
# Customize commands.
@@ -321,13 +322,19 @@ install_kernel ( ) (
kernconf=${NANO_KERNEL}
fi
+ # Install all built modules if NANO_MODULES=default,
+ # else install only listed modules (none if NANO_MODULES is empty).
+ if [ "${NANO_MODULES}" != "default" ]; then
+ modules_override_arg="MODULES_OVERRIDE='${NANO_MODULES}'"
+ fi
+
cd ${NANO_SRC}
eval "TARGET_ARCH=${NANO_ARCH} ${NANO_MAKE} installkernel \
DESTDIR='${NANO_WORLDDIR}' \
SRCCONF='${SRCCONF}' \
__MAKE_CONF='${NANO_MAKE_CONF_INSTALL}' \
${kernconfdir_arg} KERNCONF=${kernconf} \
- MODULES_OVERRIDE='${NANO_MODULES}'"
+ ${modules_override_arg}"
) > ${NANO_OBJ}/_.ik 2>&1
)
@@ -925,6 +932,10 @@ do
shift
;;
-c)
+ # Make config file path available to the config file
+ # itself so that it can access additional files relative
+ # to its own location.
+ NANO_CONFIG=$2
. "$2"
shift
shift
OpenPOWER on IntegriCloud