From owner-svn-src-stable@FreeBSD.ORG Mon May 19 11:17:44 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D3117CE9;
Mon, 19 May 2014 11:17:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A5FCE2002;
Mon, 19 May 2014 11:17:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JBHiAC053495;
Mon, 19 May 2014 11:17:44 GMT (envelope-from thomas@svn.freebsd.org)
Received: (from thomas@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JBHiGU053494;
Mon, 19 May 2014 11:17:44 GMT (envelope-from thomas@svn.freebsd.org)
Message-Id: <201405191117.s4JBHiGU053494@svn.freebsd.org>
From: Thomas Quinot <thomas@FreeBSD.org>
Date: Mon, 19 May 2014 11:17:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r266442 - stable/9/tools/tools/nanobsd
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 May 2014 11:17:44 -0000
Author: thomas
Date: Mon May 19 11:17:44 2014
New Revision: 266442
URL: http://svnweb.freebsd.org/changeset/base/266442
Log:
MFC rev. 265926:
(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.
Also update mergeinfo for past MFC of rev. 265260.
Reviewed by: imp
Modified:
stable/9/tools/tools/nanobsd/nanobsd.sh
Directory Properties:
stable/9/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/tools/ (props changed)
stable/9/tools/tools/nanobsd/ (props changed)
Modified: stable/9/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- stable/9/tools/tools/nanobsd/nanobsd.sh Mon May 19 10:08:05 2014 (r266441)
+++ stable/9/tools/tools/nanobsd/nanobsd.sh Mon May 19 11:17:44 2014 (r266442)
@@ -75,7 +75,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.
@@ -286,12 +287,18 @@ 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}' \
__MAKE_CONF='${NANO_MAKE_CONF_INSTALL}' \
${kernconfdir_arg} KERNCONF=${kernconf} \
- MODULES_OVERRIDE='${NANO_MODULES}'"
+ ${modules_override_arg}"
) > ${NANO_OBJ}/_.ik 2>&1
)
@@ -810,6 +817,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