Author: raj
Date: Thu Jul 15 10:49:07 2010
New Revision: 210112
URL: http://svn.freebsd.org/changeset/base/210112
Log:
Fix FDT_DTS_FILE parsing to properly retrieve its value. This unbreaks the
'builddtb' target.
Make the processing more robust against non-existent kernel config files
(pointed out by imp@).
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu Jul 15 10:37:49 2010 (r210111)
+++ head/Makefile.inc1 Thu Jul 15 10:49:07 2010 (r210112)
@@ -1477,8 +1477,12 @@ _xi-links:
DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
.if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
-FDT_DTS_FILE!= awk '/^makeoptions[[:space:]]+FDT_DTS_FILE/ {FS="=|[ \t]+";
print $$3}' \
+.if exists(${KERNCONFDIR}/${KERNCONF})
+FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/
{print $$2}' \
${KERNCONFDIR}/${KERNCONF}
+.else
+.error ERROR: kernel config file not found.
+.endif
.endif
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
