[ptxdist] [PATCH] dtc: Fix image creation with kernel dtc from 3.15

[Bernhard Walle <bernhard@bwalle.de>]

Starting with kernel 3.15, the help output of dtc has changed from

|               Force - try to produce output even if the input tree has errors
|       -i
|               Add a path to search for include files

to

|       Try to produce output even if the input tree has errors
| -i, --include <arg>
|       Add a path to search for include files

The new regular expression expresses this change and also works with older
kernel versions.

Without that change, the image creation of my kernel fails with following
error message:

| FATAL ERROR: Couldn't open "skeleton.dtsi": No such file or directory

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 rules/dtc.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/dtc.make b/rules/dtc.make
index 55086d1..da36971 100644
--- a/rules/dtc.make
+++ b/rules/dtc.make
@@ -47,7 +47,7 @@ ptx/dtb = $(notdir $(basename $(strip $(1)))).dtb
 		$<
 	@sed -e 's;^$(TMP_DTS):;$@:;' -e 's;^ \([^ ]*\); $$(wildcard \1);' $(TMP_DEPS) > $(DEPS)
 	@echo DTC `ptxd_print_path "$@"`
-	@if $(PTXCONF_SYSROOT_HOST)/bin/dtc -h 2>&1 | grep -q "^[[:space:]]-i$$"; then \
+	@if $(PTXCONF_SYSROOT_HOST)/bin/dtc -h 2>&1 | grep -q "^[[:space:]]\+-i\(,.*\)\?$$"; then \
 		dtc_include="-i $(dir $<) -i $(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts"; \
 	fi; \
 	$(PTXCONF_SYSROOT_HOST)/bin/dtc \
-- 
2.0.0


-- 
ptxdist mailing list
ptxdist@pengutronix.de