From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay02.ispgateway.de ([80.67.29.24]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WuKdy-0005Ie-Rc for ptxdist@pengutronix.de; Tue, 10 Jun 2014 13:55:13 +0200 From: Bernhard Walle Date: Tue, 10 Jun 2014 13:55:08 +0200 Message-Id: <1402401308-9050-1-git-send-email-bernhard@bwalle.de> Subject: [ptxdist] [PATCH] dtc: Fix image creation with kernel dtc from 3.15 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Bernhard Walle 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 | 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 --- 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