Author: thomas
Date: Sun May 11 20:44:58 2014
New Revision: 265894
URL: http://svnweb.freebsd.org/changeset/base/265894
Log:
MFC rev. 265260:
Add appropriate quoting to allow building with a KERNCONFDIR containing
spaces.
PR: kern/162736
Modified:
stable/9/Makefile.inc1 (contents, props changed)
stable/9/tools/tools/nanobsd/nanobsd.sh
Changes in other areas also in this revision:
Modified:
stable/10/Makefile.inc1
stable/10/tools/tools/nanobsd/nanobsd.sh
Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1 Sun May 11 18:49:18 2014 (r265893)
+++ stable/9/Makefile.inc1 Sun May 11 20:44:58 2014 (r265894)
@@ -926,7 +926,7 @@ buildkernel:
cd ${KRNLCONFDIR}; \
PATH=${TMPPATH} \
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
- -I ${KERNCONFDIR} ${KERNCONFDIR}/${_kernel}
+ -I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}'
.endif
.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
@echo
@@ -1657,7 +1657,7 @@ DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}
.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
.if exists(${KERNCONFDIR}/${KERNCONF})
FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/
{print $$2}' \
- ${KERNCONFDIR}/${KERNCONF} ; echo
+ '${KERNCONFDIR}/${KERNCONF}' ; echo
.endif
.endif
Modified: stable/9/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- stable/9/tools/tools/nanobsd/nanobsd.sh Sun May 11 18:49:18 2014
(r265893)
+++ stable/9/tools/tools/nanobsd/nanobsd.sh Sun May 11 20:44:58 2014
(r265894)
@@ -201,7 +201,7 @@ build_kernel ( ) (
(
if [ -f ${NANO_KERNEL} ] ; then
- kernconfdir=$(realpath $(dirname ${NANO_KERNEL}))
+ kernconfdir_arg="KERNCONFDIR='$(realpath $(dirname
${NANO_KERNEL}))'"
kernconf=$(basename ${NANO_KERNEL})
else
kernconf=${NANO_KERNEL}
@@ -214,10 +214,9 @@ build_kernel ( ) (
unset TARGET_BIG_ENDIAN
# Note: We intentionally build all modules, not only the ones in
# NANO_MODULES so the built world can be reused by multiple images.
- env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \
- __MAKE_CONF=${NANO_MAKE_CONF_BUILD} \
- ${kernconfdir:+"KERNCONFDIR="}${kernconfdir} \
- KERNCONF=${kernconf}
+ eval "TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \
+ __MAKE_CONF='${NANO_MAKE_CONF_BUILD}' \
+ ${kernconfdir_arg} KERNCONF=${kernconf}"
) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
)
@@ -281,19 +280,18 @@ install_kernel ( ) (
(
if [ -f ${NANO_KERNEL} ] ; then
- kernconfdir=$(realpath $(dirname ${NANO_KERNEL}))
+ kernconfdir_arg="KERNCONFDIR='$(realpath $(dirname
${NANO_KERNEL}))'"
kernconf=$(basename ${NANO_KERNEL})
else
kernconf=${NANO_KERNEL}
fi
cd ${NANO_SRC}
- env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \
- DESTDIR=${NANO_WORLDDIR} \
- __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \
- ${kernconfdir:+"KERNCONFDIR="}${kernconfdir} \
- KERNCONF=${kernconf} \
- MODULES_OVERRIDE="${NANO_MODULES}"
+ 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}'"
) > ${NANO_OBJ}/_.ik 2>&1
)
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
