d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add appropriate quoting to allow building with a KERNCONFDIR containing

Browse Source 
spaces.

PR:		kern/162736
MFC after:	1 week
This commit is contained in:
Thomas Quinot 2014-05-03 09:24:20 +00:00
parent 37f1b88ba0
commit cf35c685d0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc1
View File

@ -1001,7 +1001,7 @@ buildkernel:
cd ${KRNLCONFDIR}; \ cd ${KRNLCONFDIR}; \
PATH=${TMPPATH} \ PATH=${TMPPATH} \
config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \ config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
-I ${KERNCONFDIR} ${KERNCONFDIR}/${_kernel} -I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}'
.endif .endif
.if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN) .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
@echo @echo
@ -1816,7 +1816,7 @@ DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE) .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
.if exists(${KERNCONFDIR}/${KERNCONF}) .if exists(${KERNCONFDIR}/${KERNCONF})
FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \ FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
${KERNCONFDIR}/${KERNCONF} ; echo '${KERNCONFDIR}/${KERNCONF}' ; echo
.endif .endif
.endif .endif

24
tools/tools/nanobsd/nanobsd.sh
View File

@ -233,7 +233,7 @@ build_kernel ( ) (
( (
if [ -f ${NANO_KERNEL} ] ; then if [ -f ${NANO_KERNEL} ] ; then
extra="KERNCONFDIR=$(realpath $(dirname ${NANO_KERNEL}))" kernconfdir_arg="KERNCONFDIR='$(realpath $(dirname ${NANO_KERNEL}))'"
kernconf=$(basename ${NANO_KERNEL}) kernconf=$(basename ${NANO_KERNEL})
else else
kernconf=${NANO_KERNEL} kernconf=${NANO_KERNEL}
@ -245,10 +245,10 @@ build_kernel ( ) (
unset TARGET_CPUTYPE unset TARGET_CPUTYPE
# Note: We intentionally build all modules, not only the ones in # Note: We intentionally build all modules, not only the ones in
# NANO_MODULES so the built world can be reused by multiple images. # NANO_MODULES so the built world can be reused by multiple images.
env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \ eval "TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} buildkernel \
SRCCONF=${SRCCONF} \ SRCCONF='${SRCCONF}' \
${extra} __MAKE_CONF=${NANO_MAKE_CONF_BUILD} \ __MAKE_CONF='${NANO_MAKE_CONF_BUILD}' \
KERNCONF=${kernconf} ${kernconfdir_arg} KERNCONF=${kernconf}"
) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1 ) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
) )
@ -315,19 +315,19 @@ install_kernel ( ) (
( (
if [ -f ${NANO_KERNEL} ] ; then if [ -f ${NANO_KERNEL} ] ; then
extra="KERNCONFDIR=$(realpath $(dirname ${NANO_KERNEL}))" kernconfdir_arg="KERNCONFDIR='$(realpath $(dirname ${NANO_KERNEL}))'"
kernconf=$(basename ${NANO_KERNEL}) kernconf=$(basename ${NANO_KERNEL})
else else
kernconf=${NANO_KERNEL} kernconf=${NANO_KERNEL}
fi fi
cd ${NANO_SRC} cd ${NANO_SRC}
env TARGET_ARCH=${NANO_ARCH} ${NANO_MAKE} installkernel \ eval "TARGET_ARCH=${NANO_ARCH} ${NANO_MAKE} installkernel \
DESTDIR=${NANO_WORLDDIR} \ DESTDIR='${NANO_WORLDDIR}' \
SRCCONF=${SRCCONF} \ SRCCONF='${SRCCONF}' \
${extra} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \ __MAKE_CONF='${NANO_MAKE_CONF_INSTALL}' \
KERNCONF=${kernconf} \ ${kernconfdir_arg} KERNCONF=${kernconf} \
MODULES_OVERRIDE="${NANO_MODULES}" MODULES_OVERRIDE='${NANO_MODULES}'"
) > ${NANO_OBJ}/_.ik 2>&1 ) > ${NANO_OBJ}/_.ik 2>&1
) )